Merge "Fix flakiness of testTransferLaunchCookie" into sc-v2-dev (11f14b1e) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}
		}
		};