From c6e714a962776fd113408beb3399563768d2bc5d Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Thu, 5 May 2022 13:24:27 +0000 Subject: [PATCH] Revert "Revert "Clocks were switching too frequently"" This reverts commit 1ab0ed29e45e10edb26ef71b451727b93ab281ba. Reason for revert: Fixed Change-Id: I7baacba6dced16bdcaecb0edec14e7fbcb5d4b30 (cherry picked from commit 6347dec97bf89c7f9b3579961aca00260f4afd34) --- .../KeyguardNotificationVisibilityProviderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/KeyguardNotificationVisibilityProviderTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/KeyguardNotificationVisibilityProviderTest.java index dc101f3969f86..3a85972aa470a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/KeyguardNotificationVisibilityProviderTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/KeyguardNotificationVisibilityProviderTest.java @@ -233,7 +233,7 @@ public class KeyguardNotificationVisibilityProviderTest extends SysuiTestCase { @Test public void hideSilentNotificationsPerUserSettingWithHighPriorityParent() { - when(mKeyguardStateController.isShowing()).thenReturn(true); + when(mStatusBarStateController.getCurrentOrUpcomingState()).thenReturn(KEYGUARD); mFakeSettings.putBool(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, true); mFakeSettings.putBool(Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, false); GroupEntry parent = new GroupEntryBuilder() @@ -255,7 +255,7 @@ public class KeyguardNotificationVisibilityProviderTest extends SysuiTestCase { @Test public void hideSilentNotificationsPerUserSetting() { - when(mKeyguardStateController.isShowing()).thenReturn(true); + when(mStatusBarStateController.getCurrentOrUpcomingState()).thenReturn(KEYGUARD); mFakeSettings.putBool(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, true); mFakeSettings.putBool(Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, false); mEntry = new NotificationEntryBuilder()