Camera2: fix The flashlight still is on after set scene mode not auto

If we set flash mode is on when scene mode is auto, the flash mode won't
be reset when change to other scenemode and still is on.

Set the flash mode is auto when scene mode is not auto.

CRs-Fixed: 678466

Change-Id: If3874c03dc70297326b6cd7dcceb1f4efde85956

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 0b94e2592..925a53c0d 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1490,9 +1490,7 @@ public class PhotoModule
         // If scene mode is set, for flash mode, white balance and focus mode
         // read settings from preferences so we retain user preferences.
         if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
-            flashMode = mPreferences.getString(
-                    CameraSettings.KEY_FLASH_MODE,
-                    mActivity.getString(R.string.pref_camera_flashmode_default));
+            flashMode = mParameters.getFlashMode();
             String whiteBalance = mPreferences.getString(
                     CameraSettings.KEY_WHITE_BALANCE,
                     mActivity.getString(R.string.pref_camera_whitebalance_default));
@@ -2937,6 +2935,9 @@ public class PhotoModule
             mFocusManager.overrideFocusMode(mParameters.getFocusMode());
             if (hdrOn)
                 mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
+            else {
+                mParameters.setFlashMode(Parameters.FLASH_MODE_AUTO);
+            }
         }
 
         if (mContinuousFocusSupported && ApiHelper.HAS_AUTO_FOCUS_MOVE_CALLBACK) {