summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxianming wang <mingwax@codeaurora.org>2019-11-27 16:51:28 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-11-29 00:12:37 -0800
commitd588e497f536471d0957ebea350f3c3228ff386f (patch)
tree6b0c2cb1cb26767cd6e2811b08f6a7433b5d400b
parentffec76b20605e741a922960b28e772bd3cc8cfa0 (diff)
downloadandroid_packages_apps_Snap-d588e497f536471d0957ebea350f3c3228ff386f.zip
android_packages_apps_Snap-d588e497f536471d0957ebea350f3c3228ff386f.tar.gz
android_packages_apps_Snap-d588e497f536471d0957ebea350f3c3228ff386f.tar.bz2
SnapdragonCamera: Fix NP on monkey case
Fix NP on monkey case. Change-Id: Ia7e7a5bc5edab31adaf5e35668d12e77a4890257
-rwxr-xr-xsrc/com/android/camera/SettingsActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index 8d7d488..dc7ddd6 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;