diff options
| author | liangche <liangchen@codeaurora.org> | 2014-03-07 14:50:58 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-03-06 23:02:23 -0800 |
| commit | 84a338105bcf799ed66c0b6341b15b30acb1dae7 (patch) | |
| tree | 8349e77b855275a4b6a676650878c8a759d6b4ec /src/com/android/camera/PhotoMenu.java | |
| parent | 4036f931c5ef40b6b49ec15a4c46cb50e578837b (diff) | |
| download | android_packages_apps_Snap-84a338105bcf799ed66c0b6341b15b30acb1dae7.tar.gz android_packages_apps_Snap-84a338105bcf799ed66c0b6341b15b30acb1dae7.tar.bz2 android_packages_apps_Snap-84a338105bcf799ed66c0b6341b15b30acb1dae7.zip | |
Camera2: Fix HDR and ZSL conflict
Camera will crash when capture in zsl and hdr mode sametime,
fix this issue through enabling one mode will disable the other one.
CRs-fixed: 622514
Change-Id: I6a898809a174996f62269a56f2769505042aefee
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 00feadf37..d93c8ddbc 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -319,9 +319,13 @@ public class PhotoMenu extends PieController // set to non-auto. if (notSame(pref, CameraSettings.KEY_CAMERA_HDR, mSettingOff)) { setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO); + setPreference(CameraSettings.KEY_ZSL,mSettingOff); } else if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) { setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff); } + if (notSame(pref,CameraSettings.KEY_ZSL,mSettingOff)){ + setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff); + } super.onSettingChanged(pref); } |