From 3bef2d9db59db7ff9d19cb6aa5e4bc3cd9381471 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Sun, 30 Aug 2015 20:59:44 +0200 Subject: Snap: fix NPE if device doesn't support AE bracketing Change-Id: I44a19b1508cb58a4f249dd00bc9038a069f9db62 --- src/com/android/camera/PhotoModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 399f784b6..68a27531b 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); } -- cgit v1.2.3