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

Commit 28cf15bc authored by Beverly's avatar Beverly
Browse files

Don't run faceDetect when fp is locked out 

This is a temporary fix before ag/21479348 is merged.

Bug: 269200614
Test: atest KeyguardUpdateMonitorTest
Test: manually enroll fingerprint and face. After fingerprint lockout,
face detect never runs until fingerprint is no longer locked out.

Change-Id: Ic4ee8929b21d5855b4222b97637174bff9cae62b
parent c728095c

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

+2 −1
Original line number Diff line number Diff line
@@ -2843,7 +2843,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        final boolean supportsDetect = !mFaceSensorProperties.isEmpty()

                && mFaceSensorProperties.get(0).supportsFaceDetection

                && canBypass && !mPrimaryBouncerIsOrWillBeShowing

                && !isUserInLockdown(user);

                && !isUserInLockdown(user)

                && !isFingerprintLockedOut();

        final boolean faceAuthAllowedOrDetectionIsNeeded = faceAuthAllowed || supportsDetect;



        // If the face or fp has recently been authenticated do not attempt to authenticate again.

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

+34 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.keyguard; 


import static android.app.StatusBarManager.SESSION_KEYGUARD;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;

import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_TIMED;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_LOCKOUT;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_LOCKOUT_PERMANENT;

import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;
@@ -834,6 +835,39 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        verifyFaceDetectNeverCalled();

    }



    @Test

    public void noFaceRun_whenFpLockout() {

        // GIVEN bypass is enabled, face detection is supported and strong auth is required

        lockscreenBypassIsAllowed();

        supportsFaceDetection();

        strongAuthRequiredEncrypted();

        keyguardIsVisible();

        // fingerprint is NOT running, UDFPS is NOT supported



        // GIVEN fp is locked out

        when(mFingerprintManager.getLockoutModeForUser(eq(FINGERPRINT_SENSOR_ID), anyInt()))

                .thenReturn(BIOMETRIC_LOCKOUT_TIMED);

        mKeyguardUpdateMonitor.handleUserSwitchComplete(0);

        assertThat(mKeyguardUpdateMonitor.isFingerprintLockedOut()).isEqualTo(true);



        // WHEN the device wakes up

        mKeyguardUpdateMonitor.dispatchStartedWakingUp(PowerManager.WAKE_REASON_POWER_BUTTON);

        mTestableLooper.processAllMessages();



        // FACE detect is NOT triggered and face authenticate is NOT triggered

        verifyFaceDetectNeverCalled();

        verifyFaceAuthenticateNeverCalled();



        // WHEN bouncer becomes visible

        setKeyguardBouncerVisibility(true);

        clearInvocations(mFaceManager);



        // THEN face scanning is not run

        mKeyguardUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.UDFPS_POINTER_DOWN);

        verifyFaceAuthenticateNeverCalled();

        verifyFaceDetectNeverCalled();

    }



    @Test

    public void noFaceDetect_whenStrongAuthRequiredAndBypass_faceDetectionUnsupported() {

        // GIVEN bypass is enabled, face detection is NOT supported and strong auth is required