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

Commit c82d03c6 authored by Haining Chen's avatar Haining Chen
Browse files

Do not display adaptive auth string on dismissible keyguard 

After the device is locked out by adaptive auth, if it's unlocked again
by the user using face auth and doesn't skip to the home screen (i.e.
the keyguard is dismissible with swipe), do not display the adaptive
auth string in the keyguard bottom area.

Flag: EXEMPT bugfix
Fix: 353196564
Test: atest KeyguardIndicationControllerTest
Test: 1. Set up face auth and select not to skip lock screen
      2. Trigger 5 primary auth and biometric auth failures from
         BiometricPrompt, which will lock the device out
      3. Unlock the device again with face auth and do not swipe to skip
         lock screen
      4. Check that the adaptive auth string doesn't appear in the
         Keyguard bottom area
Change-Id: I52cd0a8b0d4db914cfdf758038a506ba3b2c03eb
parent c60bb9c2

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

+2 −1
Original line number Diff line number Diff line
@@ -785,7 +785,8 @@ public class KeyguardIndicationController { 


    private void updateLockScreenAdaptiveAuthMsg(int userId) {

        final boolean deviceLocked = mKeyguardUpdateMonitor.isDeviceLockedByAdaptiveAuth(userId);

        if (deviceLocked) {

        final boolean canSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer(userId);

        if (deviceLocked && !canSkipBouncer) {

            mRotateTextViewController.updateIndication(

                    INDICATION_TYPE_ADAPTIVE_AUTH,

                    new KeyguardIndication.Builder()

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

+43 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static android.hardware.biometrics.BiometricFaceConstants.FACE_ERROR_TIME 
import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_AVAILABLE;

import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED;

import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_ADAPTIVE_AUTH;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_ALIGNMENT;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_BATTERY;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_BIOMETRIC_MESSAGE;
@@ -1535,6 +1536,48 @@ public class KeyguardIndicationControllerTest extends KeyguardIndicationControll 
                trustGrantedMsg);

    }



    @Test

    public void updateAdaptiveAuthMessage_whenNotLockedByAdaptiveAuth_doesNotShowMsg() {

        // When the device is not locked by adaptive auth

        when(mKeyguardUpdateMonitor.isDeviceLockedByAdaptiveAuth(getCurrentUser()))

                .thenReturn(false);

        createController();

        mController.setVisible(true);



        // Verify that the adaptive auth message does not show

        verifyNoMessage(INDICATION_TYPE_ADAPTIVE_AUTH);

    }



    @Test

    public void updateAdaptiveAuthMessage_whenLockedByAdaptiveAuth_cannotSkipBouncer_showsMsg() {

        // When the device is locked by adaptive auth, and the user cannot skip bouncer

        when(mKeyguardUpdateMonitor.isDeviceLockedByAdaptiveAuth(getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(getCurrentUser())).thenReturn(false);

        createController();

        mController.setVisible(true);



        // Verify that the adaptive auth message shows

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

        verifyIndicationMessage(INDICATION_TYPE_ADAPTIVE_AUTH, message);

    }



    @Test

    public void updateAdaptiveAuthMessage_whenLockedByAdaptiveAuth_canSkipBouncer_doesNotShowMsg() {

        createController();

        mController.setVisible(true);



        // When the device is locked by adaptive auth, but the device unlocked state changes and the

        // user can skip bouncer

        when(mKeyguardUpdateMonitor.isDeviceLockedByAdaptiveAuth(getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(getCurrentUser())).thenReturn(true);

        mKeyguardStateControllerCallback.onUnlockedChanged();



        // Verify that the adaptive auth message does not show

        verifyNoMessage(INDICATION_TYPE_ADAPTIVE_AUTH);

    }



    private void screenIsTurningOn() {

        when(mScreenLifecycle.getScreenState()).thenReturn(SCREEN_TURNING_ON);

    }