From 8d555403517198a620a7e4348894c83e0be460ca Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Tue, 25 Jul 2023 12:57:35 +0000 Subject: [PATCH] Attempt to reduce flakiness of testTransientLaunch Use createTestTransition which makes logOnSendAsync no-op, so there won't be concurrent issue to break mocked objects. Bug: 293049485 Test: atest TransitionTests#testTransientLaunch Change-Id: Ia4b4b48b680a82f68a45361fcd7483cedd3ab749 --- .../wmtests/src/com/android/server/wm/TransitionTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java index 5154d17f2e6b8..15a3e6e625b67 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java @@ -1384,7 +1384,8 @@ public class TransitionTests extends WindowTestsBase { .mTaskSnapshotController; final ITransitionPlayer player = new ITransitionPlayer.Default(); 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 final Task task1 = createTask(mDisplayContent); @@ -1416,7 +1417,8 @@ public class TransitionTests extends WindowTestsBase { controller.finishTransition(openTransition); // 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(activity2);