Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Beverly Tai
2023-05-08 22:40:29 +00:00
committed by Android (Google) Code Review
parent ac4c6aa72f d54e01d096
commit eb6d0c3576
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -3098,7 +3098,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
Trace.beginSection("KeyguardViewMediator#onWakeAndUnlocking"); Trace.beginSection("KeyguardViewMediator#onWakeAndUnlocking");
mWakeAndUnlocking = true; mWakeAndUnlocking = true;
keyguardDone(); mKeyguardViewControllerLazy.get().notifyKeyguardAuthenticated(/* strongAuth */ false);
Trace.endSection(); Trace.endSection();
} }

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

@@ -549,6 +549,12 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
assertTrue(mViewMediator.isShowingAndNotOccluded()); assertTrue(mViewMediator.isShowingAndNotOccluded());
} }
@Test
public void testWakeAndUnlocking() {
mViewMediator.onWakeAndUnlocking();
verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(anyBoolean());
}
@Test @Test
public void testOnStartedWakingUp_logsUiEvent() { public void testOnStartedWakingUp_logsUiEvent() {
final InstanceId instanceId = InstanceId.fakeInstanceId(8); final InstanceId instanceId = InstanceId.fakeInstanceId(8);