diff options
| author | jinwu <jinwu@codeaurora.org> | 2018-10-22 16:18:55 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-01 19:44:20 -0700 |
| commit | 38b99862a1eaabb2206cc912466251d11dde793d (patch) | |
| tree | 14f6cf864b2dfd0c03877d9922e4fdab8a659c15 /src | |
| parent | ec52aba26e10c070ff2064adebe5bacbbeea2b89 (diff) | |
| download | android_packages_apps_Snap-38b99862a1eaabb2206cc912466251d11dde793d.tar.gz android_packages_apps_Snap-38b99862a1eaabb2206cc912466251d11dde793d.tar.bz2 android_packages_apps_Snap-38b99862a1eaabb2206cc912466251d11dde793d.zip | |
If flash is always on, don't go to HAL-ZSL
Change-Id: I23865c3384e70d337b29559b05bbb1f3f63f7d41
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 82f4b4c1c..68dfd2289 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1825,6 +1825,7 @@ public class CaptureModule implements CameraModule, PhotoController, Log.d(TAG, "takePicture"); mUI.enableShutter(false); if (mSettingsManager.isZSLInHALEnabled()&& + !isFlashOn(getMainCameraId())&& mPreviewCaptureResult.get(CaptureResult.CONTROL_AE_STATE) != CameraMetadata.CONTROL_AE_STATE_FLASH_REQUIRED) { takeZSLPictureInHAL(); |