diff options
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index a1c40aff5..bd998493e 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)) { |