summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjinwu <jinwu@codeaurora.org>2018-02-12 17:43:36 +0800
committerMichael Bestas <mkbestas@lineageos.org>2019-11-09 22:47:37 +0200
commit7509a263ab2cdb5804af90309a9045b71a9beb2a (patch)
treecffebfd4901e0ad5d5c43c4e107d69e241c7253a
parent438932921d290ea921d72089997a200c3e0f90be (diff)
downloadandroid_packages_apps_Snap-7509a263ab2cdb5804af90309a9045b71a9beb2a.zip
android_packages_apps_Snap-7509a263ab2cdb5804af90309a9045b71a9beb2a.tar.gz
android_packages_apps_Snap-7509a263ab2cdb5804af90309a9045b71a9beb2a.tar.bz2
Fix get aePref is null in PhotoMenu
Change-Id: I225ab63336302ff0b3b863e9cb6d2ba74ed0ac3e
-rw-r--r--src/com/android/camera/PhotoMenu.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 2da33ba..4f6c886 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1430,7 +1430,7 @@ 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")) {
+ if (aePref != null && notSame(aePref,CameraSettings.KEY_AE_BRACKET_HDR,"Off")) {
RotateTextToast.makeText(mActivity,
R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show();
}