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

Merge "Fix flakiness of testTransferLaunchCookie" into sc-v2-dev am: 11f14b1e2e

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

Change-Id: I81ad1b45bfda33868d1d12c3bd4ec779ac22d261
This commit is contained in:
TreeHugger Robot
2021-09-22 04:12:57 +00:00
committed by Automerger Merge Worker
parent d39232ede3 11f14b1e2e
commit b4be1893ff
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
public void onTaskAppeared(RunningTaskInfo taskInfo, SurfaceControl leash) {
try (SurfaceControl.Transaction t = new SurfaceControl.Transaction()) {
t.setVisibility(leash, true /* visible */).apply();
t.show(leash).apply();
}
int cookieIndex = -1;
if (trampoline.equals(taskInfo.baseActivity)) {
cookieIndex = 0;
} else if (main.equals(taskInfo.baseActivity)) {
cookieIndex = 1;
mainLatch.countDown();
}
if (cookieIndex >= 0) {
appearedCookies[cookieIndex] = taskInfo.launchCookies.isEmpty()
? null : taskInfo.launchCookies.get(0);
if (cookieIndex == 1) {
mainLatch.countDown();
}
}
}
};