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

Add null check in displayPreference

Browse Source 
Change-Id: I3afaa3f587dc5c9989d5e520f1c8a0b33e57ec7d
Fixes: 109740402
Test: ZenModeStarredContactsPreferenceControllerTest.java
This commit is contained in:
Beverly
2018-06-05 13:05:12 -04:00
parent e763ebcba1
commit b77145401f
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) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreference = screen.findPreference(KEY); mPreference = screen.findPreference(KEY);
if (mPreference != null) {
mPreference.setOnPreferenceClickListener(this); mPreference.setOnPreferenceClickListener(this);
} }
}
@Override @Override
public String getPreferenceKey() { 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(); 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);
}
} }