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

Commit a8b7c659 authored by Sam Dubey's avatar Sam Dubey Committed by Automerger Merge Worker
Browse files

Merge "Revert "Dismiss the keyguard through #notifyKeyguardAuthentiated"" into... 

Merge "Revert "Dismiss the keyguard through #notifyKeyguardAuthentiated"" into udc-dev am: 4a7a8cdc

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



Change-Id: I5a7cbb5e40b3e7b5b992fdfa3e03c530582f9327
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5f370e4 4a7a8cdc

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;



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

        keyguardDone();

        Trace.endSection();

    }

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

+0 −6
Original line number Diff line number Diff line
@@ -549,12 +549,6 @@ 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);