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

Commit 6cd2a57e authored by Chandru's avatar Chandru
Browse files

Don't run face auth if device is going to sleep 

Fixes: 245475936
Test: atest KeyguardUpdateMonitorTest
Test: Tested manually: enroll FP & face, lock phone, tap on weather in
smart space on lock screen to show UDFPS bouncer, wait for screen
timeout, face auth shouldn't run just before screen turns off

Change-Id: I34f626322265f85abc112c9cfd4d3d957229bb1a
parent 580e9514

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

+3 −2
Original line number Diff line number Diff line
@@ -2589,7 +2589,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        }



        final boolean statusBarShadeLocked = mStatusBarState == StatusBarState.SHADE_LOCKED;

        final boolean awakeKeyguard = mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep

        final boolean awakeKeyguard = mKeyguardIsVisible && mDeviceInteractive

                && !statusBarShadeLocked;

        final int user = getCurrentUser();

        final int strongAuth = mStrongAuthTracker.getStrongAuthForUser(user);
@@ -2635,7 +2635,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        // Only listen if this KeyguardUpdateMonitor belongs to the primary user. There is an

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

        final boolean shouldListen =

                (mBouncerFullyShown && !mGoingToSleep

                (mBouncerFullyShown

                        || mAuthInterruptActive

                        || mOccludingAppRequestingFace

                        || awakeKeyguard
@@ -2647,6 +2647,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                && strongAuthAllowsScanning && mIsPrimaryUser

                && (!mSecureCameraLaunched || mOccludingAppRequestingFace)

                && !faceAuthenticated

                && !mGoingToSleep

                && !fpOrFaceIsLockedOut;



        // Aggregate relevant fields for debug logging.

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

+25 −0
Original line number Diff line number Diff line
@@ -1474,6 +1474,27 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isTrue();

    }



    @Test

    public void testShouldListenForFace_udfpsBouncerIsShowingButDeviceGoingToSleep_returnsFalse()

            throws RemoteException {

        // Preconditions for face auth to run

        keyguardNotGoingAway();

        currentUserIsPrimary();

        currentUserDoesNotHaveTrust();

        biometricsNotDisabledThroughDevicePolicyManager();

        biometricsEnabledForCurrentUser();

        userNotCurrentlySwitching();

        deviceNotGoingToSleep();

        mKeyguardUpdateMonitor.setUdfpsBouncerShowing(true);

        mTestableLooper.processAllMessages();

        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isTrue();



        deviceGoingToSleep();

        mTestableLooper.processAllMessages();



        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isFalse();

    }



    @Test

    public void testShouldListenForFace_whenFaceIsLockedOut_returnsFalse()

            throws RemoteException {
@@ -1661,6 +1682,10 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.dispatchFinishedGoingToSleep(/* value doesn't matter */1);

    }



    private void deviceGoingToSleep() {

        mKeyguardUpdateMonitor.dispatchStartedGoingToSleep(/* value doesn't matter */1);

    }



    private void deviceIsInteractive() {

        mKeyguardUpdateMonitor.dispatchStartedWakingUp();

    }