diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-19 06:13:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-19 06:13:31 -0700 |
| commit | 538936e28c0a6390bca71796e50867e3dac3c18a (patch) | |
| tree | 5b7456f53253d4734b169d83348e813b9ae6faa9 | |
| parent | 58b31f9123f2060a2ea8726a9176129dca554b34 (diff) | |
| parent | 45c81755ca58953dd0d40f1b97e0fe3aac919409 (diff) | |
| download | android_packages_apps_Snap-538936e28c0a6390bca71796e50867e3dac3c18a.tar.gz android_packages_apps_Snap-538936e28c0a6390bca71796e50867e3dac3c18a.tar.bz2 android_packages_apps_Snap-538936e28c0a6390bca71796e50867e3dac3c18a.zip | |
Merge "Camera2: fix The flashlight still is on after set scene mode not auto"
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
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) { |