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

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

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

Change-Id: I2d1faaa4501022b5919002c3a4bbdefd40a46f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sam Dubey
2023-05-09 13:22:43 +00:00
committed by Automerger Merge Worker
parent 7cca89b2e7 4a7a8cdc6d
commit 4fc4e466da
2 changed files with 1 additions and 7 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");
mWakeAndUnlocking = true;
mKeyguardViewControllerLazy.get().notifyKeyguardAuthenticated(/* strongAuth */ false);
keyguardDone();
Trace.endSection();
}

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

@@ -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);