commit a03b4e43866024e77ca50315dc43f8f477b905b0
author Ajay Dudani <adudani@codeaurora.org> Sun Aug 25 15:55:02 2013 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Mon Aug 26 19:37:21 2013 -0700
tree 23dffcd900c2663b331d972889cb42d938aba4f8
parent f37420319196ecd04c5b597a4480a5c4d8343761

Always set AE_MODE_ON_AUTO_FLASH as scene mode override

All scene modes currently need AE_MODE_ON_AUTO_FLASH. Revisit this
on a per-scene mode granularity if a scene mode is defined in the
future that needs a different setting.

Change-Id: I8d43a54a0f217d6e7e9be1dca568033cac9ba93f

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 1158b3b..433b052 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2169,7 +2169,7 @@
     for (int i = 0; i < size; i++) {
         supt = 0;
         index = supported_indexes[i];
-        overridesList[j] = (uint8_t)overridesTable[index].ae_mode;
+        overridesList[j] = gCamCapability[camera_id]->flash_available ? ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH:ANDROID_CONTROL_AE_MODE_ON;
         overridesList[j+1] = (uint8_t)lookupFwkName(WHITE_BALANCE_MODES_MAP,
                                  sizeof(WHITE_BALANCE_MODES_MAP)/sizeof(WHITE_BALANCE_MODES_MAP[0]),
                                                     overridesTable[index].awb_mode);