Merge "Mark no longer flaky tests as non flaky" into rvc-dev am: 4218ce69e5 am: f7539d6594 (2334f8eb) · Commits · e / os / android_frameworks_base

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -73,7 +73,6 @@ 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 */);
		@@ -81,7 +80,6 @@ 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 */);
		@@ -89,7 +87,6 @@ public class AppTransitionTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testForceOverride() {
		mWm.prepareAppTransition(TRANSIT_KEYGUARD_UNOCCLUDE, false /* alwaysKeepCurrent */);
		mDc.prepareAppTransition(TRANSIT_ACTIVITY_OPEN,
		@@ -105,7 +102,6 @@ public class AppTransitionTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testKeepKeyguard_withCrashing() {
		mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */);
		mWm.prepareAppTransition(TRANSIT_CRASHING_ACTIVITY_CLOSE, false /* alwaysKeepCurrent */);
		@@ -113,7 +109,6 @@ public class AppTransitionTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testAppTransitionStateForMultiDisplay() {
		// Create 2 displays & presume both display the state is ON for ready to display & animate.
		final DisplayContent dc1 = createNewDisplay(Display.STATE_ON);
		@@ -182,7 +177,6 @@ public class AppTransitionTests extends WindowTestsBase {
		}

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

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

+0 −3

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

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

		@@ -91,7 +90,6 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
		}

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

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

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -677,7 +677,6 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase {
		}

		@Test
		@FlakyTest(bugId = 149760800)
		public void layoutWindowLw_withLongEdgeDisplayCutout() {
		addLongEdgeDisplayCutout();

		@@ -698,7 +697,6 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase {
		}

		@Test
		@FlakyTest(bugId = 149760800)
		public void layoutWindowLw_withLongEdgeDisplayCutout_never() {
		addLongEdgeDisplayCutout();

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

+0 −1

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

		@Test
		@FlakyTest(bugId = 131005232)
		public void testOverlappingWithNavBar() {
		final WindowState targetWin = createApplicationWindow();
		final WindowFrames winFrame = targetWin.getWindowFrames();

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -147,19 +147,16 @@ public class DragDropControllerTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testDragFlow() {
		dragFlow(0, ClipData.newPlainText("label", "Test"), 0, 0);
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testPerformDrag_NullDataWithGrantUri() {
		dragFlow(View.DRAG_FLAG_GLOBAL \| View.DRAG_FLAG_GLOBAL_URI_READ, null, 0, 0);
		}

		@Test
		@FlakyTest(bugId = 131005232)
		public void testPerformDrag_NullDataToOtherUser() {
		final WindowState otherUsersWindow =
		createDropTargetWindow("Other user's window", 1 * UserHandle.PER_USER_RANGE);