From d588e497f536471d0957ebea350f3c3228ff386f Mon Sep 17 00:00:00 2001
From: xianming wang <mingwax@codeaurora.org>
Date: Wed, 27 Nov 2019 16:51:28 +0800
Subject: SnapdragonCamera: Fix NP on monkey case

Fix NP on monkey case.

Change-Id: Ia7e7a5bc5edab31adaf5e35668d12e77a4890257
---
 src/com/android/camera/SettingsActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index 8d7d4887a..dc7ddd6ae 100755
--- a/src/com/android/camera/SettingsActivity.java
+++ b/src/com/android/camera/SettingsActivity.java
@@ -128,7 +128,10 @@ public class SettingsActivity extends PreferenceActivity {
             Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap();
             for( SettingsManager.SettingState state : settings) {
                 SettingsManager.Values values = map.get(state.key);
-                boolean enabled = values.overriddenValue == null;
+                boolean enabled = false;
+                if (values != null) {
+                    enabled = values.overriddenValue == null;
+                }
                 Preference pref = findPreference(state.key);
                 if ( pref == null ) return;
 
-- 
cgit v1.2.3