From 405c76ddc02499133d32d63c13f046d3eaed356f Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Thu, 25 Aug 2016 12:53:51 -0700
Subject: SnapdragonCamera: Always strong release when going to Camera2

Always strong release the camera when transitioning to
CaptureModule/Camera2 mode.

CRs-Fixed: 1058832
Change-Id: I51efd338879a93a2c7b84f025c274e3147e4d82f
---
 src/com/android/camera/CameraActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/com/android/camera/CameraActivity.java')

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e7c55dfab..2104b2923 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1996,7 +1996,8 @@ public class CameraActivity extends Activity
     @Override
     public void onModuleSelected(int moduleIndex) {
         boolean cam2on = SettingsManager.getInstance().isCamera2On();
-        mForceReleaseCamera = cam2on && moduleIndex == ModuleSwitcher.PHOTO_MODULE_INDEX;
+        mForceReleaseCamera = moduleIndex == ModuleSwitcher.CAPTURE_MODULE_INDEX ||
+                (cam2on && moduleIndex == ModuleSwitcher.PHOTO_MODULE_INDEX);
         if (mForceReleaseCamera) {
             moduleIndex = ModuleSwitcher.CAPTURE_MODULE_INDEX;
         }
-- 
cgit v1.2.3