summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@quicinc.com>2020-01-01 00:29:01 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2020-01-01 00:29:01 -0800
commit36d01a6c5865c06e49cb0e6da985d7c340afd4b0 (patch)
tree195604626316fcc722d7fa68717b201d59aeb2f4
parent078d6224f3b514846fc94ddbf6c3d29779f58f4e (diff)
parentd588e497f536471d0957ebea350f3c3228ff386f (diff)
downloadandroid_packages_apps_Snap-36d01a6c5865c06e49cb0e6da985d7c340afd4b0.zip
android_packages_apps_Snap-36d01a6c5865c06e49cb0e6da985d7c340afd4b0.tar.gz
android_packages_apps_Snap-36d01a6c5865c06e49cb0e6da985d7c340afd4b0.tar.bz2
Merge "SnapdragonCamera: Fix NP on monkey case" into camera-SnapdragonCamera.lnx.2.0
-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;