Merge "Fixed flaky testTaskChangeCallbacks and promote three tests to presubmit" (b14ac6e9) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import android.util.SparseBooleanArray;
		import android.view.IRecentsAnimationRunner;
		import android.view.SurfaceControl;

		import androidx.test.filters.FlakyTest;
		import androidx.test.filters.SmallTest;

		import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;
		@@ -113,7 +112,6 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 117117823)
		public void testIncludedApps_expectTargetAndVisible() {
		mWm.setRecentsAnimationController(mController);
		final AppWindowToken homeAppWindow = createAppWindowToken(mDisplayContent,

+1 −3

Original line number	Diff line number	Diff line
		@@ -100,7 +100,6 @@ public class TaskStackChangedListenerTest {
		}

		@Test
		@FlakyTest(detail = "Promote to presubmit when shown to be stable.")
		public void testTaskDescriptionChanged() throws Exception {
		final Object[] params = new Object[2];
		final CountDownLatch latch = new CountDownLatch(1);
		@@ -133,7 +132,6 @@ public class TaskStackChangedListenerTest {
		}

		@Test
		@FlakyTest(detail = "Promote to presubmit when shown to be stable.")
		public void testActivityRequestedOrientationChanged() throws Exception {
		final int[] params = new int[2];
		final CountDownLatch latch = new CountDownLatch(1);
		@@ -214,6 +212,7 @@ public class TaskStackChangedListenerTest {

		// Test for onTaskRemovalStarted.
		assertEquals(1, taskRemovalStartedLatch.getCount());
		assertEquals(1, taskRemovedLatch.getCount());
		activity.finishAndRemoveTask();
		waitForCallback(taskRemovalStartedLatch);
		// onTaskRemovalStarted happens before the activity's window is removed.
		@@ -221,7 +220,6 @@ public class TaskStackChangedListenerTest {
		assertEquals(id, params[0]);

		// Test for onTaskRemoved.
		assertEquals(1, taskRemovedLatch.getCount());
		waitForCallback(taskRemovedLatch);
		assertEquals(id, params[0]);
		waitForCallback(onDetachedFromWindowLatch);