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

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

Dismiss the keyguard through #notifyKeyguardAuthentiated 

In case a pending dismiss action exists when dreaming.

Test: manually launch an intent from dreaming and authenticate
through the alternate bouncer => see intent gets triggered
after authentication
Test: atest KeyguardViewMediatorTest
Fixes: 277284836

Change-Id: I9120460ad945caf015ea1b678d2a6e41103d42c7
parent 95741003

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -3098,7 +3098,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        Trace.beginSection("KeyguardViewMediator#onWakeAndUnlocking");

        mWakeAndUnlocking = true;



        keyguardDone();

        mKeyguardViewControllerLazy.get().notifyKeyguardAuthenticated(/* strongAuth */ false);

        Trace.endSection();

    }

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+6 −0
Original line number Diff line number Diff line
@@ -549,6 +549,12 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
        assertTrue(mViewMediator.isShowingAndNotOccluded());

    }



    @Test

    public void testWakeAndUnlocking() {

        mViewMediator.onWakeAndUnlocking();

        verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(anyBoolean());

    }



    @Test

    public void testOnStartedWakingUp_logsUiEvent() {

        final InstanceId instanceId = InstanceId.fakeInstanceId(8);