Merge "Add null check in displayPreference"

2018-06-05 18:14:17 +00:00
parent 6ffc5c43b2 b77145401f
commit 4d142c992b
2 changed files with 13 additions and 1 deletions
--- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
@@ -68,7 +68,10 @@ public class ZenModeStarredContactsPreferenceController extends
    public void displayPreference(PreferenceScreen screen) {
        super.displayPreference(screen);
        mPreference = screen.findPreference(KEY);
-        mPreference.setOnPreferenceClickListener(this);
+
+        if (mPreference != null) {
+            mPreference.setOnPreferenceClickListener(this);
+        }
    }

    @Override