diff options
| author | myfluxi <linflux@arcor.de> | 2016-01-07 19:11:57 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:22:27 -0700 |
| commit | cb08762ea59705085254df4257827f9e0a4d164e (patch) | |
| tree | f2ea19f7c49491aa1f2cb91faa1c18a01b9d2023 | |
| parent | 8e599e58874a63f58f1d0c74d65f1dbaf539a374 (diff) | |
| download | android_packages_apps_Snap-cb08762ea59705085254df4257827f9e0a4d164e.tar.gz android_packages_apps_Snap-cb08762ea59705085254df4257827f9e0a4d164e.tar.bz2 android_packages_apps_Snap-cb08762ea59705085254df4257827f9e0a4d164e.zip | |
Snap: Fix NPE when switching flash modes
If device does not support AE bracketing.
Change-Id: I6ec89518addbc786a01291e9f7dd3be3d83cb588
| -rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index fa6fe3159..2ea1263b7 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1423,9 +1423,11 @@ public class PhotoMenu extends MenuController } else if (notSame(pref,CameraSettings.KEY_FLASH_MODE,"Off")) { ListPreference aePref = mPreferenceGroup.findPreference(CameraSettings.KEY_AE_BRACKET_HDR); - if (notSame(aePref,CameraSettings.KEY_AE_BRACKET_HDR,"Off")) { - RotateTextToast.makeText(mActivity, - R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show(); + if (aePref != null) { + if (notSame(aePref,CameraSettings.KEY_AE_BRACKET_HDR,"Off")) { + RotateTextToast.makeText(mActivity, + R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show(); + } } } else if (notSame(pref, CameraSettings.KEY_LONGSHOT, mSettingOff)) { ListPreference advancefeaturePref = |