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

Commit 5e2edb82 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't run face auth if device is going to sleep" into tm-qpr-dev am: e6914146 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20111555



Change-Id: Ia0dd6ce8c572777da42a189f60965c28d4ca9445
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c030e076 e6914146

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();

    }