commit c07e3e6ce5031ff8d34fc39fac3a4bb020c78215
author jiaoyuan <jiaoyuan@codeaurora.org> Thu Jun 18 16:14:35 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 21 01:17:57 2020 -0700
tree f3cac1b137fed645083adbe850673eb6c6ddf630
parent b7e6652912ab805bf394ddb8e94afc5bdef37346

Snapcam: do not take picture when shutter button disable

 do not take picture when shutter button disable

Change-Id: I9d90c339e0ad95138b0da567fa249a8f6752ae0f

src/com/android/camera/CaptureModule.java

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 2985fbb..8e5ef6e 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3618,6 +3618,10 @@
     public void unlockFocus(int id) {
         Log.d(TAG, "unlockFocus " + id);
         isFlashRequiredInDriver = false;
+        if ((mCurrentSceneMode.mode == CameraMode.HFR) && isHighSpeedRateCapture()) {
+            Log.d(TAG, "unlockFocus should not be triggered in HFR");
+            return;
+        }
         if (!checkSessionAndBuilder(mCaptureSession[id], mPreviewRequestBuilder[id])) {
             return;
         }
@@ -6700,6 +6704,9 @@
             }
             return;
         }
+        if (!mUI.isShutterEnabled()) {
+            return;
+        }
 
         String timer = mSettingsManager.getValue(SettingsManager.KEY_TIMER);
         int seconds = Integer.parseInt(timer);