Merge "Fix PIP keyboard test"

2022-02-10 16:37:46 +00:00
parent 65c07eea84 3bbed27849
commit af9e9264f9
1 changed files with 4 additions and 2 deletions
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/BaseBubbleScreen.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/BaseBubbleScreen.kt
@@ -68,9 +68,11 @@ abstract class BaseBubbleScreen(protected val testSpec: FlickerTestParameter) {
            }

            teardown {
-                notifyManager.setBubblesAllowed(testApp.component.packageName,
+                test {
+                    notifyManager.setBubblesAllowed(testApp.component.packageName,
                        uid, NotificationManager.BUBBLE_PREFERENCE_NONE)
-                testApp.exit()
+                    testApp.exit()
+                }
            }

            extraSpec(this)