Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-v2-dev am: db09474855

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

Change-Id: I4b1dc3ffbc6eb6e0b1f9ef6243b413ba03fc2a67
This commit is contained in:
Matt Pietal
2021-08-02 18:48:54 +00:00
committed by Automerger Merge Worker

View File

@@ -67,7 +67,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper(setAsMainLooper = true)
@TestableLooper.RunWithLooper
@SmallTest
public class KeyguardViewMediatorTest extends SysuiTestCase {
private KeyguardViewMediator mViewMediator;
@@ -126,7 +126,6 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
mUnlockedScreenOffAnimationController,
() -> mNotificationShadeDepthController);
mViewMediator.start();
mViewMediator.onSystemReady();
}
@Test
@@ -165,8 +164,10 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
}
@Test
@TestableLooper.RunWithLooper(setAsMainLooper = true)
public void restoreBouncerWhenSimLockedAndKeyguardIsGoingAway() {
// When showing and provisioned
mViewMediator.onSystemReady();
when(mUpdateMonitor.isDeviceProvisioned()).thenReturn(true);
mViewMediator.setShowingLocked(true);