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

Commit b01c4e35 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Attempt to reduce flakiness of testTransientLaunch" into main

parents 052558b4 8d555403

services/tests/wmtests/src/com/android/server/wm/TransitionTests.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -1405,7 +1405,8 @@ public class TransitionTests extends WindowTestsBase { 
                .mTaskSnapshotController;

                .mTaskSnapshotController;

        final ITransitionPlayer player = new ITransitionPlayer.Default();

        final ITransitionPlayer player = new ITransitionPlayer.Default();

        controller.registerTransitionPlayer(player, null /* playerProc */);

        controller.registerTransitionPlayer(player, null /* playerProc */);

        final Transition openTransition = controller.createTransition(TRANSIT_OPEN);

        final Transition openTransition = createTestTransition(TRANSIT_OPEN, controller);

        controller.moveToCollecting(openTransition);





        // Start out with task2 visible and set up a transition that closes task2 and opens task1

        // Start out with task2 visible and set up a transition that closes task2 and opens task1

        final Task task1 = createTask(mDisplayContent);

        final Task task1 = createTask(mDisplayContent);
@@ -1437,7 +1438,8 @@ public class TransitionTests extends WindowTestsBase { 
        controller.finishTransition(openTransition);

        controller.finishTransition(openTransition);





        // We are now going to simulate closing task1 to return back to (open) task2.

        // We are now going to simulate closing task1 to return back to (open) task2.

        final Transition closeTransition = controller.createTransition(TRANSIT_CLOSE);

        final Transition closeTransition = createTestTransition(TRANSIT_CLOSE, controller);

        controller.moveToCollecting(closeTransition);





        closeTransition.collectExistenceChange(task2);

        closeTransition.collectExistenceChange(task2);

        closeTransition.collectExistenceChange(activity2);

        closeTransition.collectExistenceChange(activity2);