summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Cruz <du.alexcruz@gmail.com>2017-11-10 20:41:55 -0500
committeralk3pInjection <webmaster@raspii.tech>2022-01-27 18:50:18 +0800
commite01cdff09d8df32a42ee76a4c29ec06d5ada8284 (patch)
tree30722cbd361000bef9ab3b955c4e45b98527fb58
parent45657b3b46f4cb45fbad5eb8e1ff5940ed9b66d5 (diff)
Fix NPE when AOSP ambient display preference is removed
AndroidRuntime: Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.support.v7.preference.Preference.setOnPreferenceChangeListener(android.support.v7.preference.Preference$OnPreferenceChangeListener)' on a null object reference Change-Id: I6fbea9ec97a1506b707822cdb83469fea8211749
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java
index 20fe495f1afa..b7dbd23c0e12 100644
--- a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java
@@ -34,8 +34,10 @@ public abstract class AbstractPreferenceController {
setVisible(screen, prefKey, true /* visible */);
if (this instanceof Preference.OnPreferenceChangeListener) {
final Preference preference = screen.findPreference(prefKey);
- preference.setOnPreferenceChangeListener(
+ if (preference != null) {
+ preference.setOnPreferenceChangeListener(
(Preference.OnPreferenceChangeListener) this);
+ }
}
} else {
setVisible(screen, prefKey, false /* visible */);