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

Commit 053d63c0 authored Sep 14, 2022 by Chandru S Committed by Automerger Merge Worker Sep 14, 2022

Merge "Do not delay bouncer for running face auth if face unlock is locked...

Merge "Do not delay bouncer for running face auth if face unlock is locked out." into tm-qpr-dev am: fcbb9f98

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

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

parents 40c059e7 fcbb9f98

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@ public class KeyguardBouncer {
		&& !mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(
		KeyguardUpdateMonitor.getCurrentUser())
		&& !needsFullscreenBouncer()
		&& !mKeyguardUpdateMonitor.isFaceLockedOut()
		&& !mKeyguardUpdateMonitor.userNeedsStrongAuth()
		&& !mKeyguardBypassController.getBypassEnabled()) {
		mHandler.postDelayed(mShowRunnable, BOUNCER_FACE_DELAY);

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -408,6 +408,16 @@ public class KeyguardBouncerTest extends SysuiTestCase {
		mBouncer.hide(false /* destroyView */);
		verify(mHandler).removeCallbacks(eq(showRunnable.getValue()));
		}

		@Test
		public void testShow_doesNotDelaysIfFaceAuthIsLockedOut() {
		when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true);
		when(mKeyguardUpdateMonitor.isFaceLockedOut()).thenReturn(true);
		mBouncer.show(true /* reset */);

		verify(mHandler, never()).postDelayed(any(), anyLong());
		}

		@Test
		public void testShow_delaysIfFaceAuthIsRunning_unlessBypassEnabled() {
		when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true);