From 676be54cad694d27342ec5573acba4ce0560834e Mon Sep 17 00:00:00 2001
From: Angus Kong <shkong@google.com>
Date: Tue, 2 Apr 2013 14:56:43 -0700
Subject: Make stopPreview synchronous.

bug:8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
---
 src/com/android/camera/CameraManager.java | 3 +++
 1 file changed, 3 insertions(+)

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) {
-- 
cgit v1.2.3