diff options
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java index 988055e7d8db..9567a3b38896 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java @@ -41,8 +41,10 @@ public abstract class AbstractPreferenceController { setVisible(screen, prefKey, true /* visible */); if (this instanceof Preference.OnPreferenceChangeListener) { final Preference preference = screen.findPreference(prefKey); - preference.setOnPreferenceChangeListener( - (Preference.OnPreferenceChangeListener) this); + if (preference != null) { + preference.setOnPreferenceChangeListener( + (Preference.OnPreferenceChangeListener) this); + } } } else { setVisible(screen, prefKey, false /* visible */); |