From d54e01d0960f132f7c0161fa05505027ee82826a Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 1 May 2023 18:32:09 +0000
Subject: [PATCH] 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
---
 .../com/android/systemui/keyguard/KeyguardViewMediator.java | 2 +-
 .../android/systemui/keyguard/KeyguardViewMediatorTest.java | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 9e208fd60fd7b..a0db65ce5fdd9 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;
 
-        keyguardDone();
+        mKeyguardViewControllerLazy.get().notifyKeyguardAuthenticated(/* strongAuth */ false);
         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 d4c2bafe016fd..1d8b5ca1f54a1 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
@@ -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);