| commit | 322d67b2709c9d67fed3146ad7c51015129d5af2 | [log] [tgz] |
|---|---|---|
| author | Louis Chang <louischang@google.com> | Fri Mar 08 03:25:52 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Mar 21 23:46:19 2024 +0000 |
| tree | 8713d493c4d4160c78209120f46ad1a2a4d2af74 | |
| parent | 6ebc9af6082ae3b46ae411e65c95b03d422a978e [diff] |
Fixes the SplitAttributesCalculatorTest flakiness The test starts the activity again in order to exit pip, but that also makes the TFOrganizer applying a WCT to create a new TF to embed the launching Activity. A new transition was created because of the WCT and therefore queued up the later exit-pip transition (so the pip activity was stayed on the pip task). This CL starts the activity from the pip activity to avoid TFOrganizer applying WCT to create new TF. Bug: 316834237 Test: verify testSplitAttributesCalculatorInvocation_pip over 100 times (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9746251864acbcf63f85ba8dc6e03b8a0302d5bf) Merged-In: I8e3e577ebf8bb4f967466a183b9d20ed68020e97 Change-Id: I8e3e577ebf8bb4f967466a183b9d20ed68020e97
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/embedding/SplitAttributesCalculatorTest.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/embedding/SplitAttributesCalculatorTest.java index 93dc436..d024702 100644 --- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/embedding/SplitAttributesCalculatorTest.java +++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/embedding/SplitAttributesCalculatorTest.java
@@ -285,7 +285,7 @@ + " activity A enter PIP."); // launch Activity A again to leave the activity from PIP. - mContext.startActivity(new Intent(activityA.getIntent())); + activityA.startActivity(new Intent(activityA.getIntent())); verifier.waitAndAssertFunctionApplied("The calculator function must be called because" + " activity A leaves PIP.");