Merge "Revert "Dismiss the keyguard through #notifyKeyguardAuthentiated"" into udc-dev
This commit is contained in:
@@ -3098,7 +3098,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
|
||||
Trace.beginSection("KeyguardViewMediator#onWakeAndUnlocking");
|
||||
mWakeAndUnlocking = true;
|
||||
|
||||
mKeyguardViewControllerLazy.get().notifyKeyguardAuthenticated(/* strongAuth */ false);
|
||||
keyguardDone();
|
||||
Trace.endSection();
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user