diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-17 17:53:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-17 17:53:10 -0700 |
| commit | dc787d1a500220ff76b6ca1c95fd666ec13b4198 (patch) | |
| tree | 71a069b2289e46f55150d87280a0e06eaa78261e /src | |
| parent | f59c2333ba8679a7114a29211779a36644cb84b0 (diff) | |
| parent | 4f941e0245b1cb0c51449ada472c567fcb1cf960 (diff) | |
| download | android_packages_apps_Snap-dc787d1a500220ff76b6ca1c95fd666ec13b4198.tar.gz android_packages_apps_Snap-dc787d1a500220ff76b6ca1c95fd666ec13b4198.tar.bz2 android_packages_apps_Snap-dc787d1a500220ff76b6ca1c95fd666ec13b4198.zip | |
Merge "Snapdragon Camera: Override flash mode to off during non-auto scene"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 1dff8478c..6ea6b5c8e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1743,10 +1743,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(); @@ -3540,10 +3540,9 @@ public class PhotoModule } } 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())) { |