From fd99fd0206a4d0d96101bfb2d015753a5a44d3e1 Mon Sep 17 00:00:00 2001
From: Nataniel Borges <natanieljr@google.com>
Date: Mon, 9 Jan 2023 17:33:48 +0000
Subject: [PATCH] Gracefully close pip window after test

Try to mitigate pip-dismiss-overlay leak

Test: atest WMShellFlickerTests
Bug: 258120818
Change-Id: Ifa94292612677d9acdcc2d87cd6c06d793708d81
---
 .../android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt
index bc9fc73015416..2e57ddf16cc7f 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt
@@ -61,6 +61,8 @@ class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTest(flicker)
                 pipApp.enableEnterPipOnUserLeaveHint()
             }
             teardown {
+                // close gracefully so that onActivityUnpinned() can be called before force exit
+                pipApp.closePipWindow(wmHelper)
                 pipApp.exit(wmHelper)
             }
             transitions { tapl.goHome() }