summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjinwu <jinwu@codeaurora.org>2018-02-12 17:43:36 +0800
committerdianlujitao <dianlujitao@lineageos.org>2018-12-19 14:00:02 +0800
commit47a216dc8877fde1ddab3685d71425b065beaeba (patch)
treed2d8d7a4deb084731dbf5e91b008cd79af92d9dd
parentabcc8fbeaf4d89b8159834fc45cd1e992fbcd5aa (diff)
downloadandroid_packages_apps_Snap-47a216dc8877fde1ddab3685d71425b065beaeba.zip
android_packages_apps_Snap-47a216dc8877fde1ddab3685d71425b065beaeba.tar.gz
android_packages_apps_Snap-47a216dc8877fde1ddab3685d71425b065beaeba.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();
}