summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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);
}