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

Commit 2b9ee44d authored Feb 27, 2023 by Hawkwood Glazier Committed by Android (Google) Code Review Feb 27, 2023

Merge "Fix other reproduction of invisible keyguard race" into tm-qpr-dev

parents d8a00555 8f26dfb5

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3747,6 +3747,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
	} else {		} else {
	mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED);		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) {		} else if (mBouncerShowing && !unlocking) {
	// Bouncer needs the front scrim when it's on top of an activity,		// Bouncer needs the front scrim when it's on top of an activity,
	// tapping on a notification, editing QS or being dismissed by		// 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	Original line	Diff line number	Diff line
	@@ -1024,6 +1024,17 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
	verify(mStatusBarKeyguardViewManager).onKeyguardFadedAway();		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		@Test
	public void testShowKeyguardImplementation_setsState() {		public void testShowKeyguardImplementation_setsState() {
	when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>());		when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>());