Merge "Disable flaky tests" into sc-dev (c2e8b2c6) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,8 @@ class ExitLegacySplitScreenFromBottom(
		statusBarWindowIsAlwaysVisible()
		visibleWindowsShownMoreThanOneConsecutiveEntry(
		listOf(LAUNCHER_PACKAGE_NAME, splitScreenApp.defaultWindowName,
		secondaryApp.defaultWindowName)
		secondaryApp.defaultWindowName),
		bugId = 178447631
		)
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,8 @@ class NonResizableDismissInLegacySplitScreen(
		listOf(DOCKED_STACK_DIVIDER, LAUNCHER_PACKAGE_NAME,
		LETTERBOX_NAME, TOAST_NAME,
		splitScreenApp.defaultWindowName,
		nonResizeableApp.defaultWindowName)
		nonResizeableApp.defaultWindowName),
		bugId = 178447631
		)
		}
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -75,7 +75,8 @@ class NonResizableLaunchInLegacySplitScreen(
		LAUNCHER_PACKAGE_NAME,
		LETTERBOX_NAME,
		nonResizeableApp.defaultWindowName,
		splitScreenApp.defaultWindowName)
		splitScreenApp.defaultWindowName),
		bugId = 178447631
		)
		}
		windowManagerTrace {
		@@ -86,7 +87,8 @@ class NonResizableLaunchInLegacySplitScreen(
		LAUNCHER_PACKAGE_NAME,
		LETTERBOX_NAME,
		nonResizeableApp.defaultWindowName,
		splitScreenApp.defaultWindowName)
		splitScreenApp.defaultWindowName),
		bugId = 178447631
		)
		}
		}