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

Commit 298a6390 authored by Aaron Liu's avatar Aaron Liu
Browse files

[Bouncer] Only show swipe up and try again... 

when face auth is enrolled and face auth fails.

This was previously submitted and then reverted, but the revert was
prompted by some additional changes I made to the bouncer.

Fixes: 259007288
Test: Enroll in FP and face. Open bouncer and auth via face. Turn off
and on and open bouncer again to view initial message.
Test: Unit Test

Change-Id: Ie8762cfb6e1d74166ce6fa3723e664638708d77c
parent 27ea523b

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −1
Original line number Diff line number Diff line
@@ -930,7 +930,8 @@ public class KeyguardIndicationController { 
        if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

            if (mStatusBarKeyguardViewManager.isShowingAlternateBouncer()) {

                return; // udfps affordance is highlighted, no need to show action to unlock

            } else if (mKeyguardUpdateMonitor.isFaceEnrolled()) {

            } else if (mKeyguardUpdateMonitor.isFaceEnrolled()

                    && !mKeyguardUpdateMonitor.getIsFaceAuthenticated()) {

                String message = mContext.getString(R.string.keyguard_retry);

                mStatusBarKeyguardViewManager.setKeyguardMessage(message, mInitialTextColorState);

            }

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+16 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        String message = mContext.getString(R.string.keyguard_retry);

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(true);

        when(mKeyguardUpdateMonitor.isFaceEnrolled()).thenReturn(true);

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(false);



        mController.setVisible(true);

        mController.getKeyguardCallback().onBiometricError(FACE_ERROR_TIMEOUT,
@@ -669,6 +670,21 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        verify(mStatusBarKeyguardViewManager).setKeyguardMessage(eq(message), any());

    }



    @Test

    public void transientIndication_swipeUpToRetry_faceAuthenticated() {

        createController();

        String message = mContext.getString(R.string.keyguard_retry);

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(true);

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(true);

        when(mKeyguardUpdateMonitor.isFaceEnrolled()).thenReturn(true);



        mController.setVisible(true);

        mController.getKeyguardCallback().onBiometricError(FACE_ERROR_TIMEOUT,

                "A message", BiometricSourceType.FACE);



        verify(mStatusBarKeyguardViewManager, never()).setKeyguardMessage(eq(message), any());

    }



    @Test

    public void faceErrorTimeout_whenFingerprintEnrolled_doesNotShowMessage() {

        createController();