commit 6346ddcab47fc0a4b0b9dd7f96e3ef0002939960
author Erin Dahlgren <edahlgren@google.com> Mon Jan 13 11:35:16 2014 -0800
committer Erin Dahlgren <edahlgren@google.com> Mon Jan 13 11:35:16 2014 -0800
tree dcc467f11eff8369d8228f61ecd65b84289b99b7
parent f63967a175cabd57fcbc20275cc7918bc34b2baf

Ensure that SharedPreference listeners respond to known keys.

Bug: 12439970
Change-Id: Ic4cbfd9823a17294af3b2d3eecd654131bf92cd5

src/com/android/camera/settings/SettingsManager.java

diff --git a/src/com/android/camera/settings/SettingsManager.java b/src/com/android/camera/settings/SettingsManager.java
index e18f76f..e1a3664 100644
--- a/src/com/android/camera/settings/SettingsManager.java
+++ b/src/com/android/camera/settings/SettingsManager.java
@@ -116,8 +116,10 @@
                 @Override
                 public void onSharedPreferenceChanged(
                         SharedPreferences sharedPreferences, String key) {
-                    int settingId = mSettingsCache.getId(key);
-                    listener.onSettingChanged(SettingsManager.this, settingId);
+                    Integer settingId = mSettingsCache.getId(key);
+                    if (settingId != null) {
+                        listener.onSettingChanged(SettingsManager.this, settingId);
+                    }
                 }
             };
     }