Merge "Disable flaky test" into main (b4e39624) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenTrampolineActivityTest.kt

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -165,7 +165,6 @@ class OpenTrampolineActivityTest(flicker: LegacyFlickerTest) : ActivityEmbedding

	@FlakyTest(bugId = 290736037)		@FlakyTest(bugId = 290736037)
	/** Main activity should go from fullscreen to being a split with secondary activity. */		/** Main activity should go from fullscreen to being a split with secondary activity. */
	@Presubmit
	@Test		@Test
	fun mainActivityLayerGoesFromFullscreenToSplit() {		fun mainActivityLayerGoesFromFullscreenToSplit() {
	flicker.assertLayers {		flicker.assertLayers {
	@@ -197,6 +196,12 @@ class OpenTrampolineActivityTest(flicker: LegacyFlickerTest) : ActivityEmbedding
	}		}
	}		}

			@FlakyTest(bugId = 288591571)
			@Test
			override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
			super.visibleLayersShownMoreThanOneConsecutiveEntry()
			}

	companion object {		companion object {
	/** {@inheritDoc} */		/** {@inheritDoc} */
	private var startDisplayBounds = Rect.EMPTY		private var startDisplayBounds = Rect.EMPTY