summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoMenu.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 848b850f7..bcb4bc7a7 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1501,9 +1501,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 =