diff options
| author | Sridhar Gujje <sgujje@qti.qualcomm.com> | 2019-02-04 22:28:09 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-02-04 22:28:09 -0800 |
| commit | b5d931a976f062347880ea6973ee110688421da2 (patch) | |
| tree | d0b0616c546218da97971e6074f178d750f303e2 /src/com/android/camera/CaptureModule.java | |
| parent | 4f17836c0ee26e6c6739f2c4e97c91500ddd32b7 (diff) | |
| parent | 9f9d327b6f9515f4b9c0231a2968462031a8a494 (diff) | |
| download | android_packages_apps_Snap-b5d931a976f062347880ea6973ee110688421da2.tar.gz android_packages_apps_Snap-b5d931a976f062347880ea6973ee110688421da2.tar.bz2 android_packages_apps_Snap-b5d931a976f062347880ea6973ee110688421da2.zip | |
Merge "SnapdraongCamera:Fix HAL-ZSL flash" into camera-SnapdragonCamera.lnx.2.0
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 4c746353c..2ef56a3b6 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 { |