diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-06-16 16:36:15 +0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2014-10-20 22:41:31 +0000 |
| commit | 451a727001f11fe86d1344cea013100db6556b54 (patch) | |
| tree | b0de4241050525fec45b7545b904a4b23ca9bb5d /src/com/android/camera/PhotoModule.java | |
| parent | 2cec466387f6777db9c22ec53b8e24ceb3430c6c (diff) | |
| download | android_packages_apps_Camera2-451a727001f11fe86d1344cea013100db6556b54.tar.gz android_packages_apps_Camera2-451a727001f11fe86d1344cea013100db6556b54.tar.bz2 android_packages_apps_Camera2-451a727001f11fe86d1344cea013100db6556b54.zip | |
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
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8c80d5fd8..ce4a6916e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1501,9 +1501,7 @@ public class PhotoModule // read settings from preferences so we retain user preferences. if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode) || CameraSettings.isSlowShutterEnabled(mParameters)) { - String flashMode = mPreferences.getString( - CameraSettings.KEY_FLASH_MODE, - mActivity.getString(R.string.pref_camera_flashmode_default)); + String flashMode = mParameters.getFlashMode(); String whiteBalance = mPreferences.getString( CameraSettings.KEY_WHITE_BALANCE, mActivity.getString(R.string.pref_camera_whitebalance_default)); @@ -2817,8 +2815,11 @@ public class PhotoModule } else { mFocusManager.overrideFocusMode(mParameters.getFocusMode()); - if (hdrOn) + if (hdrOn) { mParameters.setFlashMode(Parameters.FLASH_MODE_OFF); + } else { + mParameters.setFlashMode(Parameters.FLASH_MODE_AUTO); + } } if (mContinuousFocusSupported && ApiHelper.HAS_AUTO_FOCUS_MOVE_CALLBACK) { |