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

Commit dc893208 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Better diagnostics for waitForLauncherObject" into ub-launcher3-master

parents ce08d22f b4b88afd

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+4 −3
Original line number Diff line number Diff line
@@ -380,9 +380,10 @@ public final class LauncherInstrumentation { 


    @NonNull

    UiObject2 waitForLauncherObject(String resName) {

        final UiObject2 object = mDevice.wait(Until.findObject(getLauncherObjectSelector(resName)),

                WAIT_TIME_MS);

        assertNotNull("Can't find a launcher object; id: " + resName, object);

        final BySelector selector = getLauncherObjectSelector(resName);

        final UiObject2 object = mDevice.wait(Until.findObject(selector), WAIT_TIME_MS);

        assertNotNull("Can't find a launcher object; selector: " + selector + ", current launcher: "

                + mDevice.getLauncherPackageName(), object);

        return object;

    }