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

Commit 1aeb15cd authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

Merge "Dismiss the keyguard through #notifyKeyguardAuthentiated" into udc-dev am: eb6d0c35 am: 674db0af

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



Change-Id: I095611ee63e88791a10ca30a335ecdce71f1906b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b3e3c44 674db0af

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

+1 −1
Original line number Diff line number Diff line
@@ -3104,7 +3104,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
@@ -662,6 +662,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);