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

Commit eb6d0c35 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Dismiss the keyguard through #notifyKeyguardAuthentiated" into udc-dev

parents ac4c6aa7 d54e01d0

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