diff options
author | Camera Software Integration <camswint@localhost> | 2017-03-09 06:38:20 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-09 06:38:20 -0800 |
commit | 8e890993f60a5205ecfb0ee93dd74329760c1e70 (patch) | |
tree | d1b98c473ecf30a0f53d260a19f1358d0c6dcf1e /src/com/android/camera | |
parent | 846ee0c2e67a5b50f29d7732dab6197ba346e53c (diff) | |
parent | 5cdbe4e8e3a5f9abafd23d0bbdf25d199d128000 (diff) | |
download | android_packages_apps_Snap-8e890993f60a5205ecfb0ee93dd74329760c1e70.tar.gz android_packages_apps_Snap-8e890993f60a5205ecfb0ee93dd74329760c1e70.tar.bz2 android_packages_apps_Snap-8e890993f60a5205ecfb0ee93dd74329760c1e70.zip |
Merge "SnapdragonCamera: Modify ISO vender tag" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/CaptureModule.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index a3090277d..7c3e9b418 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -378,6 +378,8 @@ public class CaptureModule implements CameraModule, PhotoController, private Size mSupportedMaxPictureSize; private Size mSupportedRawPictureSize; + private long mIsoExposureTime; + private int mIsoSensitivity; private class SelfieThread extends Thread { public void run() { @@ -4065,10 +4067,24 @@ public class CaptureModule implements CameraModule, PhotoController, if (value.equals("auto")) { request.set(SELECT_PRIORITY, 0); request.set(ISO_EXP, 0L); + if (request.get(CaptureRequest.SENSOR_EXPOSURE_TIME) == null) { + request.set(CaptureRequest.SENSOR_EXPOSURE_TIME, mIsoExposureTime); + } + if (request.get(CaptureRequest.SENSOR_SENSITIVITY) == null) { + request.set(CaptureRequest.SENSOR_SENSITIVITY, mIsoSensitivity); + } } else { long intValue = SettingsManager.KEY_ISO_INDEX.get(value); request.set(SELECT_PRIORITY, 0); request.set(ISO_EXP, intValue); + if (request.get(CaptureRequest.SENSOR_EXPOSURE_TIME) != null) { + mIsoExposureTime = request.get(CaptureRequest.SENSOR_EXPOSURE_TIME); + } + if (request.get(CaptureRequest.SENSOR_SENSITIVITY) != null) { + mIsoSensitivity = request.get(CaptureRequest.SENSOR_SENSITIVITY); + } + request.set(CaptureRequest.SENSOR_EXPOSURE_TIME, null); + request.set(CaptureRequest.SENSOR_SENSITIVITY, null); } } |