diff options
| author | 2021-02-03 13:01:08 +0000 | |
|---|---|---|
| committer | 2021-02-03 13:01:08 +0000 | |
| commit | c2e8b2c61c8cc044a0e353e8d3e5cc3767752f21 (patch) | |
| tree | c3879f7d857c193efaf8f7b8ab92c10f9a6c51b4 | |
| parent | 2b2f788072a7f1def5edf08089c0be46ae409a4a (diff) | |
| parent | 3beefa919869f4cc93b97551b8535d5eac33a707 (diff) | |
Merge "Disable flaky tests" into sc-dev
3 files changed, 8 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt index 6aed83f35327..7782364636f1 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt @@ -78,7 +78,8 @@ class ExitLegacySplitScreenFromBottom( statusBarWindowIsAlwaysVisible() visibleWindowsShownMoreThanOneConsecutiveEntry( listOf(LAUNCHER_PACKAGE_NAME, splitScreenApp.defaultWindowName, - secondaryApp.defaultWindowName) + secondaryApp.defaultWindowName), + bugId = 178447631 ) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt index 42c7b7c032cd..f2a7cda3b42d 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt @@ -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 ) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt index 5b8ec1e9c61e..421ecffc97d8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt @@ -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 ) } } |