commit 0a1832bfa4f179e5a48b17344c0773584c1bb994
author Alex Ray <aray@google.com> Mon Oct 08 14:13:04 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 08 14:13:04 2012 -0700
tree 31454ee4ba8e96f1fee1bed35d91b1125d35903b
parent a290191b7b9846ae5648e74bf8df8f496484cea3
parent 2814a4dc0dd45007ce62871af08b98214cd1692c

am 6f854608: Camera2: Set default flash mode to FLASH_OFF

* commit '6f854608d26d7abcce5e46396c7260ed7b250653':
  Camera2: Set default flash mode to FLASH_OFF

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 4d51120..91466ee 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -542,9 +542,9 @@
     if (!availableAeModes.count) return NO_INIT;
 
     if (flashAvailable.data.u8[0]) {
-        flashMode = Parameters::FLASH_MODE_AUTO;
+        flashMode = Parameters::FLASH_MODE_OFF;
         params.set(CameraParameters::KEY_FLASH_MODE,
-                CameraParameters::FLASH_MODE_AUTO);
+                CameraParameters::FLASH_MODE_OFF);
 
         String8 supportedFlashModes(CameraParameters::FLASH_MODE_OFF);
         supportedFlashModes = supportedFlashModes +