diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-08-25 12:53:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-15 15:07:16 -0700 |
| commit | 405c76ddc02499133d32d63c13f046d3eaed356f (patch) | |
| tree | 08e0b81a2cd9860e922e7262385808312de60990 /src/com/android/camera/CameraActivity.java | |
| parent | ca9a3f991cb2f18f64c36ab6f4e870cbade6c6b1 (diff) | |
| download | android_packages_apps_Snap-405c76ddc02499133d32d63c13f046d3eaed356f.tar.gz android_packages_apps_Snap-405c76ddc02499133d32d63c13f046d3eaed356f.tar.bz2 android_packages_apps_Snap-405c76ddc02499133d32d63c13f046d3eaed356f.zip | |
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
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |