commit a374b0507be31317042e096b186ec62295262a0d
author Alex Ray <aray@google.com> Mon Oct 08 16:21:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 08 16:21:43 2012 -0700
tree 3a1a0272e8304324cabd8293b4438e128129b4cd
parent a476c9e2d59048928ce50d273a8b31e723fcc492
parent 0a1832bfa4f179e5a48b17344c0773584c1bb994

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

* commit '9ea63b3bfd696bcce9cb28e86218a3449dd699d8':
  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 4ed17de..1c8585a 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 +