commit 5914783e3f0a1c1c5581361cbf6e0d9ab2cf789d
author Ruben Brunk <rubenbrunk@google.com> Tue Nov 05 15:53:28 2013 -0800
committer Ruben Brunk <rubenbrunk@google.com> Tue Nov 05 15:53:28 2013 -0800
tree cbf5249bd7af3ba3d5d4ac1912a7cb59d13f6bfe
parent bf4ce93c84400357a28f78a76df62b550e7f85d1

camera: Ensure camera release for lockscreen transition.

Bug: 11063890
Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ed13aa5..f3d1e55 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1438,7 +1438,14 @@
             mCameraDevice.setZoomChangeListener(null);
             mCameraDevice.setFaceDetectionCallback(null, null);
             mCameraDevice.setErrorCallback(null);
-            CameraHolder.instance().release();
+
+            if (mActivity.isSecureCamera() && !CameraActivity.isFirstStartAfterScreenOn()) {
+                // Blocks until camera is actually released.
+                CameraHolder.instance().strongRelease();
+            } else {
+                CameraHolder.instance().release();
+            }
+
             mFaceDetectionStarted = false;
             mCameraDevice = null;
             setCameraState(PREVIEW_STOPPED);