diff options
| author | junjiez <junjiez@codeaurora.org> | 2019-01-15 14:08:33 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-24 20:40:23 -0800 |
| commit | 9f9d327b6f9515f4b9c0231a2968462031a8a494 (patch) | |
| tree | 5e4fae3062da3cebe6337a00968c06b8f4d5512f /src/com/android/camera/CaptureModule.java | |
| parent | c58907eeea2e015791f861cec1cdae291228997a (diff) | |
| download | android_packages_apps_Snap-9f9d327b6f9515f4b9c0231a2968462031a8a494.tar.gz android_packages_apps_Snap-9f9d327b6f9515f4b9c0231a2968462031a8a494.tar.bz2 android_packages_apps_Snap-9f9d327b6f9515f4b9c0231a2968462031a8a494.zip | |
SnapdraongCamera:Fix HAL-ZSL flash
The capture result of preview repeating request
has delay, need to discard the preview capture
result when the AE lock is still true after unlock
focus to avoid chosing HAL-ZSL when flash is
needed.
Change-Id: I7b478c11be93fa12fdb4773dc57ec91a2aaf6306
CRs-Fixed: 2372219
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index f06521720..843d530bc 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1898,7 +1898,8 @@ public class CaptureModule implements CameraModule, PhotoController, if ((mSettingsManager.isZSLInHALEnabled() && !isFlashOn(getMainCameraId()) && (mPreviewCaptureResult != null && mPreviewCaptureResult.get(CaptureResult.CONTROL_AE_STATE) != - CameraMetadata.CONTROL_AE_STATE_FLASH_REQUIRED)) || + CameraMetadata.CONTROL_AE_STATE_FLASH_REQUIRED && + mPreviewCaptureResult.getRequest().get(CaptureRequest.CONTROL_AE_LOCK) != Boolean.TRUE)) || isActionImageCapture()) { takeZSLPictureInHAL(); } else { |