diff options
| author | myfluxi <linflux@arcor.de> | 2016-01-07 19:11:57 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:02:29 +0100 |
| commit | 646894cc5587615da16df90a1ccc251522643fd3 (patch) | |
| tree | 8dbfdcf9192201a0d0f8e1dc33992efa4b9fafb0 /src | |
| parent | af1ad5f305f842cf282075c55e19ec2754d2a18b (diff) | |
| download | android_packages_apps_Snap-646894cc5587615da16df90a1ccc251522643fd3.tar.gz android_packages_apps_Snap-646894cc5587615da16df90a1ccc251522643fd3.tar.bz2 android_packages_apps_Snap-646894cc5587615da16df90a1ccc251522643fd3.zip | |
Snap: Fix NPE when switching flash modes
If device does not support AE bracketing.
Change-Id: I6ec89518addbc786a01291e9f7dd3be3d83cb588
Diffstat (limited to 'src')
| -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 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 = |