Merge "Marked some WM flaky tests as such" (448daaac) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testTransitWithinTask() {
		synchronized (mWm.mGlobalLock) {
		final AppWindowToken opening = createAppWindowToken(mDisplayContent,

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ public class AppTransitionTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testKeyguardOverride() {
		mWm.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false /* alwaysKeepCurrent */);
		mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */);
		@@ -72,6 +73,7 @@ public class AppTransitionTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testKeyguardKeep() {
		mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */);
		mWm.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false /* alwaysKeepCurrent */);
		@@ -172,6 +174,7 @@ public class AppTransitionTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testLoadAnimationSafely() {
		DisplayContent dc = createNewDisplay(Display.STATE_ON);
		assertNull(dc.mAppTransition.loadAnimationSafely(

+4 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import static org.mockito.ArgumentMatchers.intThat;
		import android.platform.test.annotations.Presubmit;
		import android.view.SurfaceControl;

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

		import com.android.server.wm.WindowTestUtils.TestAppWindowToken;
		@@ -65,6 +66,7 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void clipAfterAnim_boundsLayerIsCreated() {
		mToken.mNeedsAnimationBoundsLayer = true;

		@@ -86,6 +88,7 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void clipAfterAnim_boundsLayerIsDestroyed() {
		mToken.mNeedsAnimationBoundsLayer = true;
		mToken.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
		@@ -116,6 +119,7 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void clipNoneAnim_boundsLayerIsNotCreated() {
		mToken.mNeedsAnimationBoundsLayer = false;

+1 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testLandscapeSeascapeRotationByApp() {
		// Some plumbing to get the service ready for rotation updates.
		mWm.mDisplayReady = true;