diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-12 22:46:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-12 22:46:20 -0800 |
| commit | 30e212d0dead92e0f6ab3bebeca847535e8f87c3 (patch) | |
| tree | df09309d5618583e72ea8c2c05ddd0a838e7ad08 /src | |
| parent | 1e5f1e061d0fb56ecd65638699f89f0e6bd5d22f (diff) | |
| parent | 51192a9c948ca533b7563467ef7c4f10be39038f (diff) | |
| download | android_packages_apps_Snap-30e212d0dead92e0f6ab3bebeca847535e8f87c3.tar.gz android_packages_apps_Snap-30e212d0dead92e0f6ab3bebeca847535e8f87c3.tar.bz2 android_packages_apps_Snap-30e212d0dead92e0f6ab3bebeca847535e8f87c3.zip | |
Merge "fix flash mode is wrong during longshot" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 14fe79677..5c580618a 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2141,12 +2141,12 @@ public class CaptureModule implements CameraModule, PhotoController, captureBuilder.set(CaptureRequest.CONTROL_ENABLE_ZSL, false); } + applySettingsForJpegInformation(captureBuilder, id); + applyAFRegions(captureBuilder, id); + applyAERegions(captureBuilder, id); + applySettingsForCapture(captureBuilder, id); if (!mLongshoting) { - applySettingsForJpegInformation(captureBuilder, id); - applyAFRegions(captureBuilder, id); - applyAERegions(captureBuilder, id); VendorTagUtil.setCdsMode(captureBuilder, 2);// CDS 0-OFF, 1-ON, 2-AUTO - applySettingsForCapture(captureBuilder, id); applyCaptureMFNR(captureBuilder); } applyCaptureBurstFps(captureBuilder); |