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

Commit cd94650c authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Only run face auth when the assistant becomes visible 

Don't run face auth if the assistant stopped being visible.

Test: KeyguardUpdateMonitorTest
Fixes: 319666295
Flag: NONE
Change-Id: Icf023b9908ee970dd86428c44835a30087dec043
parent 5b4e13aa

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

+3 −3
Original line number Diff line number Diff line
@@ -1644,11 +1644,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    void setAssistantVisible(boolean assistantVisible) {

        mAssistantVisible = assistantVisible;

        mLogger.logAssistantVisible(mAssistantVisible);

        updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);

        if (mAssistantVisible) {

            if (getFaceAuthInteractor() != null) {

                getFaceAuthInteractor().onAssistantTriggeredOnLockScreen();

            }

        updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);

        if (mAssistantVisible) {

            requestActiveUnlock(

                    ActiveUnlockConfig.ActiveUnlockRequestOrigin.ASSISTANT,

                    "assistant",

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

+18 −0
Original line number Diff line number Diff line
@@ -1719,6 +1719,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                eq(true));

    }



    @Test

    public void assistantVisible_sendEventToFaceAuthInteractor() {

        // WHEN the assistant is visible

        mKeyguardUpdateMonitor.setAssistantVisible(true);



        // THEN send event to face auth interactor

        verify(mFaceAuthInteractor).onAssistantTriggeredOnLockScreen();

    }



    @Test

    public void assistantNotVisible_doesNotSendEventToFaceAuthInteractor() {

        // WHEN the assistant is visible

        mKeyguardUpdateMonitor.setAssistantVisible(false);



        // THEN never send event to face auth interactor

        verify(mFaceAuthInteractor, never()).onAssistantTriggeredOnLockScreen();

    }



    @Test

    public void fingerprintFailure_requestActiveUnlock_dismissKeyguard() {

        // GIVEN shouldTriggerActiveUnlock