diff options
| author | Emilian Peev <epeevs@codeaurora.org> | 2014-12-05 09:30:50 +0200 |
|---|---|---|
| committer | Emilian Peev <epeevs@codeaurora.org> | 2015-03-05 18:17:22 +0200 |
| commit | 4f941e0245b1cb0c51449ada472c567fcb1cf960 (patch) | |
| tree | b2c4ccc40e4c8c2c5afbe46b39bad0c18e9a61f3 /src | |
| parent | 17cbd51a5a135be5cc5d32f8dc3b21d9ff8e047c (diff) | |
| download | android_packages_apps_Snap-4f941e0245b1cb0c51449ada472c567fcb1cf960.tar.gz android_packages_apps_Snap-4f941e0245b1cb0c51449ada472c567fcb1cf960.tar.bz2 android_packages_apps_Snap-4f941e0245b1cb0c51449ada472c567fcb1cf960.zip | |
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: Iaae2bc0d392f9dc384a68ad6390f9510eb7a65ed
CRs-Fixed: 765000
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 8d8d4e6b6..21e365bce 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1738,10 +1738,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(); @@ -3510,10 +3510,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())) { |