diff options
author | Camera Software Integration <camswint@localhost> | 2016-10-03 10:10:17 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-03 10:10:17 -0700 |
commit | 0d4ac4ee04322171f0f3f4986e072980284f18fd (patch) | |
tree | a5e3e52a5551cd7502c551e153d85ef397bf22e5 /src/com/android/camera/CaptureModule.java | |
parent | 4bc76d5b7e56b0522b9ff87b441e41162f996bcf (diff) | |
parent | b3ad5e2ecf348fd8621995d711bf9e31b5c0e1bc (diff) | |
download | android_packages_apps_Snap-0d4ac4ee04322171f0f3f4986e072980284f18fd.tar.gz android_packages_apps_Snap-0d4ac4ee04322171f0f3f4986e072980284f18fd.tar.bz2 android_packages_apps_Snap-0d4ac4ee04322171f0f3f4986e072980284f18fd.zip |
Merge "SnapdragonCamera: Only release shutter for main cam" into camera.lnx.1.0.c7-dev
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rw-r--r-- | src/com/android/camera/CaptureModule.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 8f2006a1c..c914b8602 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1456,13 +1456,15 @@ public class CaptureModule implements CameraModule, PhotoController, applySettingsForUnlockExposure(mPreviewRequestBuilder[id], id); setAFModeToPreview(id, mControlAFMode); mTakingPicture[id] = false; - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - mUI.stopSelfieFlash(); - mUI.enableShutter(true); - } - }); + if (id == getMainCameraId()) { + mActivity.runOnUiThread(new Runnable() { + @Override + public void run() { + mUI.stopSelfieFlash(); + mUI.enableShutter(true); + } + }); + } } catch (CameraAccessException e) { e.printStackTrace(); } |