summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 4890d7455..b1d10114d 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1631,9 +1631,16 @@ public class PhotoModule
new JpegPictureCallback(loc));
setCameraState(SNAPSHOT_IN_PROGRESS);
- // LGE G4: Preview needs to be restarted when flash got used while luminance is low
- if (CameraUtil.isLowLuminance(mParameters)) {
- setupPreview();
+ // LGE G4: Preview needs to be restarted when flash got used
+ if (CameraUtil.isSupported(mParameters, CameraSettings.KEY_LUMINANCE_CONITION)) {
+ String flashMode = mPreferences.getString(
+ CameraSettings.KEY_FLASH_MODE,
+ mActivity.getString(R.string.pref_camera_flashmode_default));
+ if (flashMode.equals(Parameters.FLASH_MODE_ON) ||
+ (!flashMode.equals(Parameters.FLASH_MODE_OFF) &&
+ CameraUtil.isLowLuminance(mParameters))) {
+ setupPreview();
+ }
}
}