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

Commit f22da1e1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Persist face error message for permanent lockout"

parents cd0c0c63 c47df86c

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+4 −5
Original line number Diff line number Diff line
@@ -1883,9 +1883,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        final boolean awakeKeyguard = mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep;

        final int user = getCurrentUser();

        final int strongAuth = mStrongAuthTracker.getStrongAuthForUser(user);

        final boolean isLockOutOrLockDown =

                containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_LOCKOUT)

                        || containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW)

        final boolean isLockDown =

                containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW)

                        || containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);

        final boolean isEncryptedOrTimedOut =

                containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_BOOT)
@@ -1899,9 +1898,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        boolean becauseCannotSkipBouncer = !getUserCanSkipBouncer(user) || canBypass;



        // Scan even when encrypted or timeout to show a preemptive bouncer when bypassing.

        // Lockout/lockdown modes shouldn't scan, since they are more explicit.

        // Lock-down mode shouldn't scan, since it is more explicit.

        boolean strongAuthAllowsScanning = (!isEncryptedOrTimedOut || canBypass && !mBouncer)

                && !isLockOutOrLockDown;

                && !isLockDown;



        // Only listen if this KeyguardUpdateMonitor belongs to the primary user. There is an

        // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+2 −2
Original line number Diff line number Diff line
@@ -437,14 +437,14 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    }



    @Test

    public void testIgnoresAuth_whenLockout() {

    public void testTriesToAuthenticate_whenLockout() {

        mKeyguardUpdateMonitor.dispatchStartedWakingUp();

        mTestableLooper.processAllMessages();

        when(mStrongAuthTracker.getStrongAuthForUser(anyInt())).thenReturn(

                KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT);



        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager, never()).authenticate(any(), any(), anyInt(), any(), any(), anyInt());

        verify(mFaceManager).authenticate(any(), any(), anyInt(), any(), any(), anyInt());

    }



    @Test

services/core/java/com/android/server/biometrics/face/FaceService.java

+2 −1
Original line number Diff line number Diff line
@@ -962,9 +962,10 @@ public class FaceService extends BiometricServiceBase { 
        @Override

        public void onLockoutChanged(long duration) {

            Slog.d(TAG, "onLockoutChanged: " + duration);



            if (duration == 0) {

                mCurrentUserLockoutMode = AuthenticationClient.LOCKOUT_NONE;

            } else if (duration == Long.MAX_VALUE) {

            } else if (duration == -1 || duration == Long.MAX_VALUE) {

                mCurrentUserLockoutMode = AuthenticationClient.LOCKOUT_PERMANENT;

            } else {

                mCurrentUserLockoutMode = AuthenticationClient.LOCKOUT_TIMED;