summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-02-04 08:29:29 -0800
committerLinux Build Service Account <lnxbuild@localhost>2020-02-04 08:29:29 -0800
commitc09bffb2b864dfdea0be88bc85f528c1e80f103d (patch)
treec95d3fd0c4000b61f87ba4c193780dd8d0aca8be
parent77f8a1d01f466022b83134cb41cd6a6c041b194e (diff)
parent7dafc0bea65f88b9f9ba707a317b371df53d32af (diff)
downloadandroid_packages_apps_Snap-c09bffb2b864dfdea0be88bc85f528c1e80f103d.zip
android_packages_apps_Snap-c09bffb2b864dfdea0be88bc85f528c1e80f103d.tar.gz
android_packages_apps_Snap-c09bffb2b864dfdea0be88bc85f528c1e80f103d.tar.bz2
Merge 7dafc0bea65f88b9f9ba707a317b371df53d32af on remote branch
Change-Id: I070f3467ad207d76a6a77c1e23d1c66b3b114652
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index a1c40af..bd99849 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4001,7 +4001,8 @@ public class CaptureModule implements CameraModule, PhotoController,
if (scene == null) return false;
int mode = Integer.parseInt(scene);
if (mode != CaptureRequest.CONTROL_SCENE_MODE_DISABLED
- && mode < SettingsManager.SCENE_MODE_CUSTOM_START)
+ && mode < SettingsManager.SCENE_MODE_CUSTOM_START
+ && mode != SettingsManager.SCENE_MODE_HDR_INT)
return true;
return false;
}
@@ -6087,6 +6088,7 @@ public class CaptureModule implements CameraModule, PhotoController,
int colorTempValue = Integer.parseInt(pref.getString(
SettingsManager.KEY_MANUAL_WB_TEMPERATURE_VALUE, "-1"));
if (colorTempValue != -1) {
+ request.set(CaptureRequest.CONTROL_AWB_MODE, CaptureRequest.CONTROL_AWB_MODE_OFF);
VendorTagUtil.setWbColorTemperatureValue(request, colorTempValue);
}
} else if (manualWBMode.equals(gainMode)) {