summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Stefani <luca.stefani.ge1@gmail.com>2015-08-30 20:59:44 +0200
committerMichael Bestas <mikeioannina@gmail.com>2015-09-17 23:26:03 +0300
commit3bef2d9db59db7ff9d19cb6aa5e4bc3cd9381471 (patch)
treeee8fa44cd7d0bfa1fe00f1d3cd6463f3602d28c8
parent7fc6a997a345884d164c4845de4cd7f7fb016bcc (diff)
downloadandroid_packages_apps_Snap-3bef2d9db59db7ff9d19cb6aa5e4bc3cd9381471.zip
android_packages_apps_Snap-3bef2d9db59db7ff9d19cb6aa5e4bc3cd9381471.tar.gz
android_packages_apps_Snap-3bef2d9db59db7ff9d19cb6aa5e4bc3cd9381471.tar.bz2
Snap: fix NPE if device doesn't support AE bracketing
Change-Id: I44a19b1508cb58a4f249dd00bc9038a069f9db62
-rw-r--r--src/com/android/camera/PhotoModule.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 399f784..68a2753 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1814,7 +1814,7 @@ public class PhotoModule
}
/* Disable focus if aebracket is ON */
String aeBracket = mParameters.get(CameraSettings.KEY_QC_AE_BRACKETING);
- if (!aeBracket.equalsIgnoreCase("off")) {
+ if (aeBracket != null && !aeBracket.equalsIgnoreCase("off")) {
String fMode = Parameters.FLASH_MODE_OFF;
mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, fMode);
mParameters.setFlashMode(fMode);
@@ -3258,7 +3258,7 @@ public class PhotoModule
/* Disable focus if aebracket is ON */
String aeBracket = mParameters.get(CameraSettings.KEY_QC_AE_BRACKETING);
- if (!aeBracket.equalsIgnoreCase("off")) {
+ if (aeBracket != null && !aeBracket.equalsIgnoreCase("off")) {
String fMode = Parameters.FLASH_MODE_OFF;
mParameters.setFlashMode(fMode);
}