diff options
author | Angus Kong <shkong@google.com> | 2013-04-02 23:05:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-02 23:05:03 +0000 |
commit | 7a02a7916312cc25e03badd30a76b36c92a007bc (patch) | |
tree | 8769ef7ca87f1c6843c2120ba90b0556c94713d7 /src/com/android/camera | |
parent | f16b61831d53b1319f6543e1df616805b34b5279 (diff) | |
parent | b71331b1c245e039901b89f20342749e95d9d7a8 (diff) | |
download | android_packages_apps_Snap-7a02a7916312cc25e03badd30a76b36c92a007bc.tar.gz android_packages_apps_Snap-7a02a7916312cc25e03badd30a76b36c92a007bc.tar.bz2 android_packages_apps_Snap-7a02a7916312cc25e03badd30a76b36c92a007bc.zip |
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/CameraManager.java | 3 |
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) { |