diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-02-21 11:17:12 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:24:50 -0700 |
| commit | 0fce8e0312da43cfd2c7e5dfa063823d5a895a68 (patch) | |
| tree | 3ade0d533965cc18954b4668934e9548f6fc2beb /src/com/android | |
| parent | fd2e2913fdf63139234a0b7c115b245e0357d102 (diff) | |
| download | android_packages_apps_Snap-0fce8e0312da43cfd2c7e5dfa063823d5a895a68.tar.gz android_packages_apps_Snap-0fce8e0312da43cfd2c7e5dfa063823d5a895a68.tar.bz2 android_packages_apps_Snap-0fce8e0312da43cfd2c7e5dfa063823d5a895a68.zip | |
Snap: fix camera hang on LGE G4 when flash got used
Change-Id: I23e53333a0bbe2a12e64e87ec8594aeaa503e9fc
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/camera/PhotoModule.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 70affd271..25f06f8ee 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1756,9 +1756,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(); + } } } |