Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 071a6d7b authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-v2-dev am: db094748 am: 52db7b3d 

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

Change-Id: Ic0b900992611d3724e2fbea7021f7d89d5b6d419
parents b7d4cac8 52db7b3d

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

+3 −2
Original line number Diff line number Diff line
@@ -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);