Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7615e236 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Revert "Revert "Clocks were switching too frequently"" am: c6e714a9 am: b24b9fe4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186418



Change-Id: I67e91483a6bca31951f5bf2d353585274c8bfc1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c026fbe b24b9fe4

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/KeyguardNotificationVisibilityProviderTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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()