Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9238ae6e authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Disable flaky tests" into sc-dev am: c2e8b2c6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13468327

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I413d6c1ef964428afd5652d6ac8caa5349b07d73
parents 06fe0d17 c2e8b2c6

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

                        )

                    }

                }

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

+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

                        )

                    }

                }

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

+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

                        )

                    }

                }