Merge "Add null check in displayPreference"

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

tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java

@@ -190,4 +190,13 @@ public class ZenModeStarredContactsPreferenceControllerTest {
             assertThat(contacts.get(i)).isNotNull();
         }
     }
+
+    @Test
+    public void nullPreference_displayPreference() {
+        when(mPreferenceScreen.findPreference(mMessagesController.getPreferenceKey()))
+                .thenReturn(null);
+
+        // should not throw a null pointer
+        mMessagesController.displayPreference(mPreferenceScreen);
+    }
 }