From f76caafdf5224ffebe5043fd02e888c1dfc534a2 Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Tue, 9 May 2023 12:05:04 +0000 Subject: [PATCH] Revert "Dismiss the keyguard through #notifyKeyguardAuthentiated" This reverts commit d54e01d0960f132f7c0161fa05505027ee82826a. Reason for revert: Testing platinum bug b/281655973 Change-Id: I3be3b2b7727baf9da6851524f4cade1e8aa2cf9f --- .../com/android/systemui/keyguard/KeyguardViewMediator.java | 2 +- .../android/systemui/keyguard/KeyguardViewMediatorTest.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index a0db65ce5fdd9..9e208fd60fd7b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -3098,7 +3098,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, Trace.beginSection("KeyguardViewMediator#onWakeAndUnlocking"); mWakeAndUnlocking = true; - mKeyguardViewControllerLazy.get().notifyKeyguardAuthenticated(/* strongAuth */ false); + keyguardDone(); Trace.endSection(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java index 1d8b5ca1f54a1..d4c2bafe016fd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java @@ -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);