From bbd23aef704512a47553fe0008436f7c544af3fe Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 7 Oct 2022 16:28:30 +0000 Subject: [PATCH] Revert "[Bouncer] ensure bouncer not shown with doze state." This reverts commit f348307f7ba56ac38d746cde837638dd623156c6. Reason for revert: Causing sim related regressions on the release branch Change-Id: I0cd9830056c41971f7f0f7f33f2567aa40969c19 --- .../phone/StatusBarKeyguardViewManager.java | 5 ---- .../StatusBarKeyguardViewManagerTest.java | 24 ------------------- 2 files changed, 29 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index a0578fac2033e..9d5392af3127c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -733,11 +733,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (dozing || mBouncer.needsFullscreenBouncer() || mOccluded) { reset(dozing /* hideBouncerWhenShowing */); } - - if (bouncerIsOrWillBeShowing()) { - // Ensure bouncer is not shown when dozing state changes. - hideBouncer(false); - } updateStates(); if (!dozing) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index f52bfcaaaa448..dcce61b86ced3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -23,11 +23,9 @@ import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -527,26 +525,4 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mBouncerExpansionCallback.onVisibilityChanged(false); verify(mCentralSurfaces).setBouncerShowingOverDream(false); } - - - @Test - public void testSetDozing_bouncerShowing_Dozing() { - clearInvocations(mBouncer); - when(mBouncer.isShowing()).thenReturn(true); - doAnswer(invocation -> { - when(mBouncer.isShowing()).thenReturn(false); - return null; - }).when(mBouncer).hide(false); - mStatusBarKeyguardViewManager.onDozingChanged(true); - verify(mBouncer, times(1)).hide(false); - } - - @Test - public void testSetDozing_bouncerShowing_notDozing() { - mStatusBarKeyguardViewManager.onDozingChanged(true); - when(mBouncer.isShowing()).thenReturn(true); - clearInvocations(mBouncer); - mStatusBarKeyguardViewManager.onDozingChanged(false); - verify(mBouncer, times(1)).hide(false); - } }