Snapdragon Camera: Override flash mode to off during non-auto scene

 Currently the flash mode on application side will
 be set to 'auto' during scenes different from
 'auto'. Due to the manual white balance modes used
 in these scenes it makes more sense to actually
 have flash mode set to off.

Change-Id: Ief40a76de2f6481eb27b0e47e28ac8b4573429df
CRs-Fixed: 765000

1 files changed, 4 insertions, 5 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index aaefc0bfb..6a6c83145 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1797,10 +1797,10 @@ public class PhotoModule
                     Toast.LENGTH_LONG).show();
         }
 
-        // If scene mode is set, for flash mode, white balance and focus mode
+        // If scene mode is set, for white balance and focus mode
         // read settings from preferences so we retain user preferences.
         if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
-            flashMode = mParameters.getFlashMode();
+            flashMode = mParameters.FLASH_MODE_OFF;
             String whiteBalance = Parameters.WHITE_BALANCE_AUTO;
             focusMode = mFocusManager.getFocusMode();
             colorEffect = mParameters.getColorEffect();
@@ -3634,10 +3634,9 @@ public class PhotoModule
                     mActivity.getString(R.string.pref_camera_focustime_default))));
         } else {
             mFocusManager.overrideFocusMode(mParameters.getFocusMode());
-            if (hdrOn)
+            if (CameraUtil.isSupported(Parameters.FLASH_MODE_OFF,
+                    mParameters.getSupportedFlashModes())) {
                 mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
-            else {
-                mParameters.setFlashMode(Parameters.FLASH_MODE_AUTO);
             }
             if (CameraUtil.isSupported(Parameters.WHITE_BALANCE_AUTO,
                     mParameters.getSupportedWhiteBalance())) {