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

Commit db00e56e authored Feb 28, 2023 by Hawkwood Glazier Committed by Automerger Merge Worker Feb 28, 2023

Merge "Fix other reproduction of invisible keyguard race" into tm-qpr-dev am: 2b9ee44d

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

Change-Id: I3ef7ac143f2ab66dba689465e41ac09c12658808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents bf2b06f8 2b9ee44d

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -3748,6 +3748,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		} else {
		mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED);
		}
		// This will cancel the keyguardFadingAway animation if it is running. We need to do
		// this as otherwise it can remain pending and leave keyguard in a weird state.
		mUnlockScrimCallback.onCancelled();
		} else if (mBouncerShowing && !unlocking) {
		// Bouncer needs the front scrim when it's on top of an activity,
		// tapping on a notification, editing QS or being dismissed by

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -1024,6 +1024,17 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
		verify(mStatusBarKeyguardViewManager).onKeyguardFadedAway();
		}

		@Test
		public void testSetDozingNotUnlocking_transitionToAuthScrimmed_cancelKeyguardFadingAway() {
		when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(true);
		when(mKeyguardStateController.isKeyguardFadingAway()).thenReturn(true);

		mCentralSurfaces.updateScrimController();

		verify(mScrimController).transitionTo(eq(ScrimState.AUTH_SCRIMMED_SHADE));
		verify(mStatusBarKeyguardViewManager).onKeyguardFadedAway();
		}

		@Test
		public void testShowKeyguardImplementation_setsState() {
		when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>());