Merge "Fix crash on rotation"

This commit is contained in:
Julia Reynolds
2020-09-16 13:21:31 +00:00
committed by Android (Google) Code Review
2 changed files with 10 additions and 8 deletions

View File

@@ -89,7 +89,7 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS,
1);
mController.updateState(mPreference);
mController.displayPreference(mScreen);
assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_none));
@@ -107,7 +107,7 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS,
0);
mController.updateState(mPreference);
mController.displayPreference(mScreen);
assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_alerting));
@@ -124,7 +124,7 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS,
1);
mController.updateState(mPreference);
mController.displayPreference(mScreen);
assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_all));
@@ -136,7 +136,7 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
public void updateState_allNotifsOnLockscreen_isDefault() {
// settings don't exist
mController.updateState(mPreference);
mController.displayPreference(mScreen);
assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_all));
@@ -158,7 +158,7 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
mController.updateState(mPreference);
mController.displayPreference(mScreen);
assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_none));