commit 2d6a503f548ac047f30995c4f74f58259ab9027b
author Eino-Ville Talvala <etalvala@google.com> Mon Sep 03 10:03:26 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 06 11:42:12 2012 -0700
tree c6e87466cd5afe47e1da78348110c5769a306466
parent 69230df9905534cda15becd44c0109874c4be5f0

Camera2: Move locked states out of AE/AWB mode

Bug: 6243944

Change-Id: I7b609cc6c04c957d1f48c1a996263fa9c7b94000

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 1cad2ae..f89d1e3 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1336,11 +1336,15 @@
             previewFpsRange, 2);
     if (res != OK) return res;
 
-    uint8_t reqWbMode = autoWhiteBalanceLock ?
-            (uint8_t)ANDROID_CONTROL_AWB_LOCKED : wbMode;
     res = request->update(ANDROID_CONTROL_AWB_MODE,
-            &reqWbMode, 1);
+            &wbMode, 1);
     if (res != OK) return res;
+
+    uint8_t reqWbLock = autoWhiteBalanceLock ?
+            ANDROID_CONTROL_AWB_LOCK_ON : ANDROID_CONTROL_AWB_LOCK_OFF;
+    res = request->update(ANDROID_CONTROL_AWB_LOCK,
+            &reqWbLock, 1);
+
     res = request->update(ANDROID_CONTROL_EFFECT_MODE,
             &effectMode, 1);
     if (res != OK) return res;
@@ -1380,8 +1384,6 @@
                     cameraId, flashMode);
             return BAD_VALUE;
     }
-    if (autoExposureLock) reqAeMode = ANDROID_CONTROL_AE_LOCKED;
-
     res = request->update(ANDROID_FLASH_MODE,
             &reqFlashMode, 1);
     if (res != OK) return res;
@@ -1389,6 +1391,11 @@
             &reqAeMode, 1);
     if (res != OK) return res;
 
+    uint8_t reqAeLock = autoExposureLock ?
+            ANDROID_CONTROL_AE_LOCK_ON : ANDROID_CONTROL_AE_LOCK_OFF;
+    res = request->update(ANDROID_CONTROL_AE_LOCK,
+            &reqAeLock, 1);
+
     float reqFocusDistance = 0; // infinity focus in diopters
     uint8_t reqFocusMode;
     switch (focusMode) {