From c89e663119ab92aa71f4f038ce94909a70369fc6 Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Tue, 17 Nov 2020 15:02:00 +0800 Subject: [PATCH] 3/ Fix bug of PipKeyboardTest do not forceExit() testApp successfully After PipKeyboardTest teardown{}, the testApp in PIP mode is alive and introduce the NEXT flicker test case get unexpected assertion fails. Root cause: The flow of exit(), neither pressHome() nor pressBack() could lead TestApp(in PIP) successfully exit PIP and back to fullscreen in teardown. Bug: 173477410 Test: atest com.android.wm.shell.flicker, make sure all tests PASSED Test: atest WMShellFlickerTests, make sure all tests PASSED Change-Id: I5e7e6f0323b2e6145dc25e2b8e99b77557f4ce13 --- .../src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt index d343f2a7093ba..3813d4dc37000 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt @@ -76,12 +76,12 @@ class PipKeyboardTest( } teardown { test { - keyboardApp.exit() + keyboardApp.forceStop() if (device.hasPipWindow()) { device.closePipWindow() } - testApp.exit() + testApp.forceStop() this.setRotation(Surface.ROTATION_0) } }