SnapdragonCamera: Fix crash when switching between camera1, camera2

Camera1 uses CameraHolder for opening/releasing camera and
it does not release right away when closing camera.
This is done to optimize opening/closing but since Camera2
does not use CameraHolder, state is not proper when switching
between camera1 and camera2.
So ignore the timer and release right away when going from
camera1 to camera2.

Change-Id: Ibc40297817ebfca04e19097bd463f78aec4d75cd
CRs-Fixed: 1019338

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 210fe3600..8d7243c5c 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -380,7 +380,11 @@ public class WideAnglePanoramaModule
 
     private void releaseCamera() {
         if (mCameraDevice != null) {
-            CameraHolder.instance().release();
+            if (mActivity.isForceReleaseCamera()) {
+                CameraHolder.instance().strongRelease();
+            } else {
+                CameraHolder.instance().release();
+            }
             mCameraDevice.setErrorCallback(null);
             mCameraDevice = null;
             mCameraState = PREVIEW_STOPPED;