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

Commit f0732e73 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Workarounding setup wizard non-disappearance only in presubmit" into main

parents 1c8e30b5 341e5598

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

+4 −4
Original line number Diff line number Diff line
@@ -332,7 +332,9 @@ public abstract class AbstractLauncherUiTest { 
    // TODO(309471958) Productize killing/dismissal of setup wizard.

    /** Waits for setup wizard to go away. */

    public static void waitForSetupWizardDismissal() {

        if (sFirstTimeWaitingForWizard && TestStabilityRule.isPresubmit()) {

        if (!TestStabilityRule.isPresubmit()) return;



        if (sFirstTimeWaitingForWizard) {

            try {

                getUiDevice().executeShellCommand(

                        "am force-stop com.google.android.setupwizard");
@@ -345,9 +347,7 @@ public abstract class AbstractLauncherUiTest { 
                Until.gone(By.pkg("com.google.android.setupwizard").depth(0)),

                sFirstTimeWaitingForWizard ? 120000 : 0);

        sFirstTimeWaitingForWizard = false;

        // b/309496273

//        Assert.assertTrue("Setup wizard is still visible",

//                wizardDismissed);

        Assert.assertTrue("Setup wizard is still visible", wizardDismissed);

    }



    private static void verifyKeyguardInvisible() {