From 6d5c4d042bedef2a934fb4c0d1ae149e94405178 Mon Sep 17 00:00:00 2001 From: myfluxi Date: Thu, 7 Jan 2016 19:11:57 +0100 Subject: Snap: Fix NPE when switching flash modes If device does not support AE bracketing. Change-Id: I6ec89518addbc786a01291e9f7dd3be3d83cb588 --- src/com/android/camera/PhotoMenu.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/com/android/camera') 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 = -- cgit v1.2.3