Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flakiness of testTransferLaunchCookie" am: c2cd376f6f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884198

Change-Id: Ie238b3709e6ca6a57a3a30f2f43c526184fdb793
This commit is contained in:
Riddle Hsu
2021-11-09 08:11:21 +00:00
committed by Automerger Merge Worker
parent 49dd528c4f c2cd376f6f
commit c51eb6a40e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/tests/wmtests/src/com/android/server/wm/ActivityOptionsTest.java
View File

@@ -110,18 +110,20 @@ public class ActivityOptionsTest {
@Override @Override
public void onTaskAppeared(RunningTaskInfo taskInfo, SurfaceControl leash) { public void onTaskAppeared(RunningTaskInfo taskInfo, SurfaceControl leash) {
try (SurfaceControl.Transaction t = new SurfaceControl.Transaction()) { try (SurfaceControl.Transaction t = new SurfaceControl.Transaction()) {
t.setVisibility(leash, true /* visible */).apply(); t.show(leash).apply();
} }
int cookieIndex = -1; int cookieIndex = -1;
if (trampoline.equals(taskInfo.baseActivity)) { if (trampoline.equals(taskInfo.baseActivity)) {
cookieIndex = 0; cookieIndex = 0;
} else if (main.equals(taskInfo.baseActivity)) { } else if (main.equals(taskInfo.baseActivity)) {
cookieIndex = 1; cookieIndex = 1;
mainLatch.countDown();
} }
if (cookieIndex >= 0) { if (cookieIndex >= 0) {
appearedCookies[cookieIndex] = taskInfo.launchCookies.isEmpty() appearedCookies[cookieIndex] = taskInfo.launchCookies.isEmpty()
? null : taskInfo.launchCookies.get(0); ? null : taskInfo.launchCookies.get(0);
if (cookieIndex == 1) {
mainLatch.countDown();
}
} }
} }
}; };