From 6d1611a82ec1d52559860c01293cc9ee9fef6f66 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Tue, 25 Jul 2023 17:13:51 +0000 Subject: [PATCH] Only dismiss tasks in SplitScreenBase setup if there are task to dismiss Bug: 293136758 Test: atest com.android.wm.shell.flicker.splitscreen Change-Id: I755ea2ef3cf2c4ba3895608dc9e6dbe423ba733f --- .../wm/shell/flicker/splitscreen/benchmark/SplitScreenBase.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/SplitScreenBase.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/SplitScreenBase.kt index 2a07369062c85..fdcb7e5a09843 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/SplitScreenBase.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/SplitScreenBase.kt @@ -33,7 +33,9 @@ abstract class SplitScreenBase(flicker: LegacyFlickerTest) : BaseBenchmarkTest(f tapl.setEnableRotation(true) setRotation(flicker.scenario.startRotation) tapl.setExpectedRotation(flicker.scenario.startRotation.value) - tapl.workspace.switchToOverview().dismissAllTasks() + if (tapl.workspace.switchToOverview().hasTasks()) { + tapl.workspace.switchToOverview().dismissAllTasks() + } } }