PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check in displayPreference"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-05 18:14:17 +00:00
committed by Android (Google) Code Review
parent 6ffc5c43b2 b77145401f
commit 4d142c992b
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
View File

@@ -68,8 +68,11 @@ public class ZenModeStarredContactsPreferenceController extends
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(KEY);
if (mPreference != null) {
mPreference.setOnPreferenceClickListener(this);
}
}
@Override
public String getPreferenceKey() {

9
tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
View File

@@ -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);
}
}