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

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();
         }