diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-29 02:05:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-29 02:05:42 -0800 |
| commit | d2ad03b608bf1fc506102851631fcb8d7434043a (patch) | |
| tree | 63e28a6ac660559bb40a680c3a92e276101edfbc /src | |
| parent | f98f43e3b12dc62703ef85ab64460939be99c85a (diff) | |
| parent | 0f92054cc425360cbe965b65840a918d0f69968b (diff) | |
| download | android_packages_apps_Snap-d2ad03b608bf1fc506102851631fcb8d7434043a.tar.gz android_packages_apps_Snap-d2ad03b608bf1fc506102851631fcb8d7434043a.tar.bz2 android_packages_apps_Snap-d2ad03b608bf1fc506102851631fcb8d7434043a.zip | |
Merge "SnapdragonCamera:Fix promode ISO"
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 1320a5579..e725faaf3 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4275,7 +4275,15 @@ public class CaptureModule implements CameraModule, PhotoController, String value = mSettingsManager.getValue(SettingsManager.KEY_ISO); if (applyManualIsoExposure(request)) return; if (value == null) return; - if (value.equals("auto")) { + String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); + boolean promode = false; + if (scene != null) { + int mode = Integer.parseInt(scene); + if (mode == SettingsManager.SCENE_MODE_PROMODE_INT) { + promode = true; + } + } + if (!promode || value.equals("auto")) { VendorTagUtil.setIsoExpPrioritySelectPriority(request, 0); VendorTagUtil.setIsoExpPriority(request, 0L); if (request.get(CaptureRequest.SENSOR_EXPOSURE_TIME) == null) { |