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

Commit a61ac589 authored by Sam Saccone's avatar Sam Saccone Committed by Android (Google) Code Review
Browse files

Merge "Failing all e2e tests after seeing a lock screen without additional... 

Merge "Failing all e2e tests after seeing a lock screen without additional checks for the lock screen" into udc-dev
parents fbf2d5e7 160c8217

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+9 −3
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ public abstract class AbstractLauncherUiTest { 


    private static boolean sDumpWasGenerated = false;

    private static boolean sActivityLeakReported = false;

    private static boolean sSeenKeygard = false;



    private static final String SYSTEMUI_PACKAGE = "com.android.systemui";



    protected LooperExecutor mMainThreadExecutor = MAIN_EXECUTOR;
@@ -237,9 +239,13 @@ public abstract class AbstractLauncherUiTest { 
    @Before

    public void setUp() throws Exception {

        mLauncher.onTestStart();

        Assert.assertTrue("Keyguard is visible, which is likely caused by a crash in SysUI",

                TestHelpers.wait(

                        Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));



        sSeenKeygard = sSeenKeygard

                || !TestHelpers.wait(

                Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000);



        Assert.assertFalse("Keyguard is visible, which is likely caused by a crash in SysUI",

                sSeenKeygard);



        final String launcherPackageName = mDevice.getLauncherPackageName();

        try {