diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-02-21 11:17:12 +0100 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:48 +0200 |
| commit | ab13db8c087aad0efec4c786ccd30b411518aaa3 (patch) | |
| tree | 7532dee32527bcc9200d5bdd4604e5a4f1efc6f0 | |
| parent | 7b112b09b9aa2773c06f758b45bb20a0c883ed72 (diff) | |
| download | android_packages_apps_Snap-ab13db8c087aad0efec4c786ccd30b411518aaa3.tar.gz android_packages_apps_Snap-ab13db8c087aad0efec4c786ccd30b411518aaa3.tar.bz2 android_packages_apps_Snap-ab13db8c087aad0efec4c786ccd30b411518aaa3.zip | |
Snap: fix camera hang on LGE G4 when flash got used
Change-Id: I23e53333a0bbe2a12e64e87ec8594aeaa503e9fc
| -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(); + } } } |