From 9ef0a2ab0557a18d5d9e201eba4f5b676a754e4b Mon Sep 17 00:00:00 2001
From: jiaoyuan <jiaoyuan@codeaurora.org>
Date: Tue, 16 Jun 2020 09:33:11 +0800
Subject: [PATCH] Snapcam: after long press, flash is not off
fix flash is not off after long press
Change-Id: If3d99995415e07b42fc29d9f423d2d63b1d3d79c
---
src/com/android/camera/CaptureModule.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 871c87e31..e57db13b7 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2906,7 +2906,6 @@ public class CaptureModule implements CameraModule, PhotoController,
CaptureRequest.Builder captureBuilder = getRequestBuilder(
CameraDevice.TEMPLATE_STILL_CAPTURE,id);
-
if(mLockAFAE){
applySettingsForLockExposure(captureBuilder, id);
}
@@ -3750,16 +3749,20 @@ public class CaptureModule implements CameraModule, PhotoController,
if(!mLockAFAE) {
mControlAFMode = CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
mIsAutoFocusStarted = false;
+ }
+ applyFlash(mPreviewRequestBuilder[id], id);
+ if(!mLockAFAE) {
applySettingsForUnlockExposure(mPreviewRequestBuilder[id], id);
+ }
+ if (mSettingsManager.isDeveloperEnabled()) {
+ applyCommonSettings(mPreviewRequestBuilder[id], id);
+ }
+ if(!mLockAFAE) {
int afMode = (mSettingsManager.isDeveloperEnabled() && getDevAfMode() != -1) ?
getDevAfMode() : mControlAFMode;
setAFModeToPreview(id, mUI.getCurrentProMode() == ProMode.MANUAL_MODE ?
CaptureRequest.CONTROL_AF_MODE_OFF : afMode);
}
- applyFlash(mPreviewRequestBuilder[id], id);
- if (mSettingsManager.isDeveloperEnabled()) {
- applyCommonSettings(mPreviewRequestBuilder[id], id);
- }
mTakingPicture[id] = false;
enableShutterAndVideoOnUiThread(id,false);
} catch (NullPointerException | IllegalStateException | CameraAccessException e) {
--
GitLab