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

Commit 13874029 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Only update biometric state when keyguard is showing" into udc-dev am: 18929c87 

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



Change-Id: I7ebdcabd04d76a29fcfc2d2f9f4e6ee9dfdc0401
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 154e2358 18929c87

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

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

                        || shouldListenForFingerprintAssistant

                        || (mKeyguardOccluded && mIsDreaming)

                        || (mKeyguardOccluded && userDoesNotHaveTrust

                        || (mKeyguardOccluded && userDoesNotHaveTrust && mKeyguardShowing

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



        // 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 Diff line number Diff line
@@ -1010,6 +1010,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(false)).isFalse();

        verifyFingerprintAuthenticateNeverCalled();

        // WHEN alternate bouncer is shown

        mKeyguardUpdateMonitor.setKeyguardShowing(true, true);

        mKeyguardUpdateMonitor.setAlternateBouncerShowing(true);



        // THEN make sure FP listening begins
@@ -2731,6 +2732,21 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                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() {

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