diff options
author | myfluxi <linflux@arcor.de> | 2016-01-07 19:11:57 +0100 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-07 13:49:11 -0800 |
commit | 6d5c4d042bedef2a934fb4c0d1ae149e94405178 (patch) | |
tree | ceeacfbb30ed1c25abdb3ab401e2bb6254e496b8 /src/com/android/camera | |
parent | 3626f48bf1293ba1e8b15309df9a698a77fe786e (diff) | |
download | android_packages_apps_Snap-6d5c4d042bedef2a934fb4c0d1ae149e94405178.tar.gz android_packages_apps_Snap-6d5c4d042bedef2a934fb4c0d1ae149e94405178.tar.bz2 android_packages_apps_Snap-6d5c4d042bedef2a934fb4c0d1ae149e94405178.zip |
Snap: Fix NPE when switching flash modes
If device does not support AE bracketing.
Change-Id: I6ec89518addbc786a01291e9f7dd3be3d83cb588
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | 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 6df60cefe..332783265 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1164,9 +1164,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 = |