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

Commit e3a0a01c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update to 2 failed udfps attempts to show bouncer" into sc-v2-dev am:... 

Merge "Update to 2 failed udfps attempts to show bouncer" into sc-v2-dev am: 6445db66 am: c0ed5e9f

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

Change-Id: I3dc50d3aec06e467ce859f63b26fd1ac9ee64b26
parents 01a6d8d0 c0ed5e9f

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
    private static final long BIOMETRIC_WAKELOCK_TIMEOUT_MS = 15 * 1000;

    private static final String BIOMETRIC_WAKE_LOCK_NAME = "wake-and-unlock:wakelock";

    private static final UiEventLogger UI_EVENT_LOGGER = new UiEventLoggerImpl();

    private static final int FP_ATTEMPTS_BEFORE_SHOW_BOUNCER = 3;

    private static final int FP_ATTEMPTS_BEFORE_SHOW_BOUNCER = 2;



    @IntDef(prefix = { "MODE_" }, value = {

            MODE_NONE,

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

+3 −4
Original line number Diff line number Diff line
@@ -381,16 +381,15 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
    }



    @Test

    public void onUdfpsConsecutivelyFailedThreeTimes_showBouncer() {

    public void onUdfpsConsecutivelyFailedTwoTimes_showBouncer() {

        // GIVEN UDFPS is supported

        when(mUpdateMonitor.isUdfpsSupported()).thenReturn(true);



        // WHEN udfps fails twice - then don't show the bouncer

        mBiometricUnlockController.onBiometricAuthFailed(BiometricSourceType.FINGERPRINT);

        // WHEN udfps fails once - then don't show the bouncer

        mBiometricUnlockController.onBiometricAuthFailed(BiometricSourceType.FINGERPRINT);

        verify(mStatusBarKeyguardViewManager, never()).showBouncer(anyBoolean());



        // WHEN udfps fails the third time

        // WHEN udfps fails the second time

        mBiometricUnlockController.onBiometricAuthFailed(BiometricSourceType.FINGERPRINT);



        // THEN show the bouncer