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 | 0e018f44d4ecccd9be27bd4eac04957741ae57d2 (patch) | |
| tree | 083f348513fb726b7a7aabaf7a2147d3b1fb47e8 | |
| parent | 7bf0f568f7e09275477f1ff2a4ac107274798329 (diff) | |
| parent | 676be54cad694d27342ec5573acba4ce0560834e (diff) | |
| download | android_packages_apps_Gallery2-0e018f44d4ecccd9be27bd4eac04957741ae57d2.tar.gz android_packages_apps_Gallery2-0e018f44d4ecccd9be27bd4eac04957741ae57d2.tar.bz2 android_packages_apps_Gallery2-0e018f44d4ecccd9be27bd4eac04957741ae57d2.zip | |
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
| -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) { |