diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-08-25 12:53:51 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 11:22:21 -0700 |
| commit | c617a1e03508ee346e296026db2dbd86ca1196c9 (patch) | |
| tree | 295e4b2c484e63615f68abeec822a3d8b75a4161 /src/com/android/camera/CameraActivity.java | |
| parent | 05c84ec784839a8d204610197e4af0f04dac2e67 (diff) | |
| download | android_packages_apps_Snap-c617a1e03508ee346e296026db2dbd86ca1196c9.tar.gz android_packages_apps_Snap-c617a1e03508ee346e296026db2dbd86ca1196c9.tar.bz2 android_packages_apps_Snap-c617a1e03508ee346e296026db2dbd86ca1196c9.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')
| -rwxr-xr-x | 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 3579586e7..7c9687077 100755 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1977,7 +1977,8 @@ public class CameraActivity extends Activity @Override public void onModuleSelected(int moduleIndex) { boolean cam2on = mSettingsManager.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; } |