summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorxianming wang <mingwax@codeaurora.org>2017-12-27 14:47:21 +0800
committerxianming wang <mingwax@codeaurora.org>2017-12-27 14:52:26 +0800
commita3d72561dd2ac3b662c91dedd2cf75464e9e53fa (patch)
tree616f3b70c7cbe526b75a730c3043e9fccc737b6f /src
parent443f1ffe54ee3cb511676940272f45c15a1ae34e (diff)
downloadandroid_packages_apps_Snap-a3d72561dd2ac3b662c91dedd2cf75464e9e53fa.tar.gz
android_packages_apps_Snap-a3d72561dd2ac3b662c91dedd2cf75464e9e53fa.tar.bz2
android_packages_apps_Snap-a3d72561dd2ac3b662c91dedd2cf75464e9e53fa.zip
SnapdragonCamera: Fix NullPointerException in monkey test
Fix NullPointerException in monkey test. CRs-Fixed: 2164267 Change-Id: I7f3b5066b84d511f276a2118ee6bca36fe7a30d7
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c4810557e..b9d1ef92b 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4503,6 +4503,7 @@ public class CaptureModule implements CameraModule, PhotoController,
String userSetting = mActivity.getString(
R.string.pref_camera_manual_exp_value_user_setting);
String manualExposureMode = mSettingsManager.getValue(SettingsManager.KEY_MANUAL_EXPOSURE);
+ if (manualExposureMode == null) return result;
if (manualExposureMode.equals(isoPriority)) {
int isoValue = Integer.parseInt(pref.getString(SettingsManager.KEY_MANUAL_ISO_VALUE,
"100"));