summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorxianming wang <mingwax@codeaurora.org>2018-12-20 15:01:08 +0800
committerxianming wang <mingwax@codeaurora.org>2018-12-20 15:03:31 +0800
commitf1138300c86349f15d4aaf3b15adfffc0d9ef82e (patch)
treeb770e348be4e7d03828b1933c550e151d0d8819a /src
parentc48104739d7221ff3c617f34f2d6c63be5888288 (diff)
downloadandroid_packages_apps_Snap-f1138300c86349f15d4aaf3b15adfffc0d9ef82e.tar.gz
android_packages_apps_Snap-f1138300c86349f15d4aaf3b15adfffc0d9ef82e.tar.bz2
android_packages_apps_Snap-f1138300c86349f15d4aaf3b15adfffc0d9ef82e.zip
SnapdragonCamera: Fix NP when mValuesMap is Null
Fix NP when mValuesMap is NULL in SettingsManager. CRs-Fixed: 2370431 Change-Id: I4e05b3a2eac4e571d2673b15eaa9e5a742f07b34
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/SettingsActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index 4cff72f75..8e80d5686 100755
--- a/src/com/android/camera/SettingsActivity.java
+++ b/src/com/android/camera/SettingsActivity.java
@@ -658,6 +658,7 @@ public class SettingsActivity extends PreferenceActivity {
updateVideoHDRPreference();
Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap();
+ if (map == null) return;
Set<Map.Entry<String, SettingsManager.Values>> set = map.entrySet();
for (Map.Entry<String, SettingsManager.Values> entry : set) {