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

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

Browse Source 
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
parent ed87bc2898 db09474855
commit 52db7b3d35
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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