From 80d6a378b9943fa072458be23c675a0bba8e83fd Mon Sep 17 00:00:00 2001 From: Beverly Date: Mon, 15 Nov 2021 12:09:21 -0500 Subject: [PATCH] Show scrimmed bouncer from BiometricUnlockCtrl Test: manual Test: atest BiometrisUnlockControllerTest Fixes: 206423147 Bug: 205556311 Change-Id: Ib3def01e7ffd04ac950f06cbee7d213927110b5b (cherry picked from commit 7c64f2cd038e54fdb4df885420dda0f7c6846801) Merged-In: Ib3def01e7ffd04ac950f06cbee7d213927110b5b --- .../statusbar/phone/BiometricUnlockController.java | 2 +- .../statusbar/phone/BiometricsUnlockControllerTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java index 2c76cfeff733b..67f51cb9ab438 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java @@ -485,7 +485,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp private void showBouncer() { if (mMode == MODE_SHOW_BOUNCER) { - mKeyguardViewController.showBouncer(false); + mKeyguardViewController.showBouncer(true); } mShadeController.animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */, false /* delayed */, BIOMETRIC_COLLAPSE_SPEEDUP_FACTOR); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java index 4276f7ce7b121..25fd801338971 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java @@ -134,7 +134,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { .thenReturn(false); mBiometricUnlockController.onBiometricAuthenticated(UserHandle.USER_CURRENT, BiometricSourceType.FINGERPRINT, true /* isStrongBiometric */); - verify(mStatusBarKeyguardViewManager).showBouncer(eq(false)); + verify(mStatusBarKeyguardViewManager).showBouncer(anyBoolean()); verify(mStatusBarKeyguardViewManager, never()).notifyKeyguardAuthenticated(anyBoolean()); assertThat(mBiometricUnlockController.getMode()) .isEqualTo(BiometricUnlockController.MODE_SHOW_BOUNCER); @@ -146,7 +146,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { .thenReturn(false); mBiometricUnlockController.onBiometricAuthenticated(UserHandle.USER_CURRENT, BiometricSourceType.FINGERPRINT, false /* isStrongBiometric */); - verify(mStatusBarKeyguardViewManager).showBouncer(eq(false)); + verify(mStatusBarKeyguardViewManager).showBouncer(anyBoolean()); verify(mShadeController).animateCollapsePanels(anyInt(), anyBoolean(), anyBoolean(), anyFloat()); assertThat(mBiometricUnlockController.getMode()) @@ -265,10 +265,10 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { BiometricSourceType.FACE, true /* isStrongBiometric */); // Wake up before showing the bouncer - verify(mStatusBarKeyguardViewManager, never()).showBouncer(eq(false)); + verify(mStatusBarKeyguardViewManager, never()).showBouncer(anyBoolean()); mBiometricUnlockController.mWakefulnessObserver.onFinishedWakingUp(); - verify(mStatusBarKeyguardViewManager).showBouncer(eq(false)); + verify(mStatusBarKeyguardViewManager).showBouncer(anyBoolean()); assertThat(mBiometricUnlockController.getMode()) .isEqualTo(BiometricUnlockController.MODE_SHOW_BOUNCER); }