diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-12-26 22:29:09 +0100 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2017-02-18 14:47:37 +0000 |
| commit | ec6475e59265ade5f0771d4b215a1009f2ca9cd3 (patch) | |
| tree | c83afe177594fa91b186f277b78a11822d503bf7 | |
| parent | f17e1272d105ab76cc2fad56c491b2911c1a4e17 (diff) | |
| download | android_packages_apps_Snap-ec6475e59265ade5f0771d4b215a1009f2ca9cd3.tar.gz android_packages_apps_Snap-ec6475e59265ade5f0771d4b215a1009f2ca9cd3.tar.bz2 android_packages_apps_Snap-ec6475e59265ade5f0771d4b215a1009f2ca9cd3.zip | |
Snap: CaptureModule: re-apply flash setting when disabling manual iso
Change-Id: I98663a2a99239751c84116640bc9abf841665a73
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d9a410aff..152423e93 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2974,13 +2974,14 @@ public class CaptureModule extends BaseModule<CaptureUI> implements PhotoControl String value = mSettingsManager.getValue(SettingsManager.KEY_ISO); if (value == null) return; if (value.equals("auto")) { - request.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); + int flashMode = request.get(CaptureRequest.CONTROL_AE_MODE); + applyFlash(request, Integer.toString(flashMode)); } else { int intValue = Integer.parseInt(value); request.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_OFF); request.set(CaptureRequest.SENSOR_SENSITIVITY, intValue); request.set(CaptureRequest.SENSOR_EXPOSURE_TIME, EXPOSURE_TIME_DEFAULT); - } + } } private void applyColorEffect(CaptureRequest.Builder request) { |