summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-04-02 14:56:43 -0700
committerAngus Kong <shkong@google.com>2013-04-02 15:17:06 -0700
commitb71331b1c245e039901b89f20342749e95d9d7a8 (patch)
tree957e305d36a0a13ad88357767cc4eee0b43be948
parent187a09a330f9c62783741b85b86b12610b2f595d (diff)
downloadandroid_packages_apps_Snap-b71331b1c245e039901b89f20342749e95d9d7a8.tar.gz
android_packages_apps_Snap-b71331b1c245e039901b89f20342749e95d9d7a8.tar.bz2
android_packages_apps_Snap-b71331b1c245e039901b89f20342749e95d9d7a8.zip
Make stopPreview synchronous.
bug:8517092 Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
-rw-r--r--src/com/android/camera/CameraManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java
index be82ea613..a26a51cf9 100644
--- a/src/com/android/camera/CameraManager.java
+++ b/src/com/android/camera/CameraManager.java
@@ -334,8 +334,11 @@ public class CameraManager {
mCameraHandler.sendEmptyMessage(START_PREVIEW_ASYNC);
}
+ // stopPreview() is synchronous because many resources should be released after
+ // the preview is stopped.
public void stopPreview() {
mCameraHandler.sendEmptyMessage(STOP_PREVIEW);
+ waitDone();
}
public void setPreviewCallback(final PreviewCallback cb) {