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

Commit 7dbff053 authored by Diya Bera's avatar Diya Bera
Browse files

Only update biometric state when keyguard is showing 

Bug: 276474113
Test: atest KeyguardUpdateMonitorTest
Change-Id: I8dbc62c538f78ff0ceb482a9e911fd6c14ef8d57
parent 4c6f5787

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2857,7 +2857,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        || mGoingToSleep

                        || mGoingToSleep

                        || shouldListenForFingerprintAssistant

                        || shouldListenForFingerprintAssistant

                        || (mKeyguardOccluded && mIsDreaming)

                        || (mKeyguardOccluded && mIsDreaming)

                        || (mKeyguardOccluded && userDoesNotHaveTrust

                        || (mKeyguardOccluded && userDoesNotHaveTrust && mKeyguardShowing

                            && (mOccludingAppRequestingFp || isUdfps || mAlternateBouncerShowing));

                            && (mOccludingAppRequestingFp || isUdfps || mAlternateBouncerShowing));





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

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

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

+16 −0
Original line number Original line Diff line number Diff line
@@ -931,6 +931,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(false)).isFalse();

        assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(false)).isFalse();

        verifyFingerprintAuthenticateNeverCalled();

        verifyFingerprintAuthenticateNeverCalled();

        // WHEN alternate bouncer is shown

        // WHEN alternate bouncer is shown

        mKeyguardUpdateMonitor.setKeyguardShowing(true, true);

        mKeyguardUpdateMonitor.setAlternateBouncerShowing(true);

        mKeyguardUpdateMonitor.setAlternateBouncerShowing(true);





        // THEN make sure FP listening begins

        // THEN make sure FP listening begins
@@ -2662,6 +2663,21 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                KeyguardUpdateMonitor.getCurrentUser())).isTrue();

                KeyguardUpdateMonitor.getCurrentUser())).isTrue();

    }

    }





    @Test

    public void testFingerprintListeningStateWhenOccluded() {

        when(mAuthController.isUdfpsSupported()).thenReturn(true);



        mKeyguardUpdateMonitor.setKeyguardShowing(false, false);

        mKeyguardUpdateMonitor.dispatchStartedWakingUp(PowerManager.WAKE_REASON_BIOMETRIC);

        mKeyguardUpdateMonitor.setKeyguardShowing(false, true);



        verifyFingerprintAuthenticateNeverCalled();



        mKeyguardUpdateMonitor.setKeyguardShowing(true, true);

        mKeyguardUpdateMonitor.setAlternateBouncerShowing(true);



        verifyFingerprintAuthenticateCall();

    }





    private void verifyFingerprintAuthenticateNeverCalled() {

    private void verifyFingerprintAuthenticateNeverCalled() {

        verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), any());

        verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), any());