diff options
author | Jay Wang <jaywang@codeaurora.org> | 2016-09-13 13:05:33 -0700 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 11:26:50 -0700 |
commit | b3ad5e2ecf348fd8621995d711bf9e31b5c0e1bc (patch) | |
tree | bfd7f980b4232aa5537333e48b2e0fd46f55b273 /src/com/android | |
parent | 03796fd7939bb14506d5e191216cae81c8f99fbf (diff) | |
download | android_packages_apps_Snap-b3ad5e2ecf348fd8621995d711bf9e31b5c0e1bc.tar.gz android_packages_apps_Snap-b3ad5e2ecf348fd8621995d711bf9e31b5c0e1bc.tar.bz2 android_packages_apps_Snap-b3ad5e2ecf348fd8621995d711bf9e31b5c0e1bc.zip |
SnapdragonCamera: Only release shutter for main cam
Only release shutter when main camera is unlocked. Queueing two
runnables can result in race condition where shutter is re-enabled
after being disabled due to shutter click.
CRs-Fixed: 1068525
Change-Id: I70def909e4c2c0eafc15e31475992248da3b74b7
Diffstat (limited to 'src/com/android')
-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(); } |