From e92019976150577cdf36b0b6d767604623c7bd86 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Mon, 9 Aug 2021 17:14:20 -0700 Subject: [PATCH] Disable PipLegacySplitScreenTest when Shell Transition is on. Bug: 193565745 Test: atest Change-Id: I3055d461ae00d8e0e97e971897d7df24107dfc3f --- .../wm/shell/flicker/pip/PipLegacySplitScreenTest.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt index c09fdc203dbcd..050beb377978b 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt @@ -31,7 +31,10 @@ import com.android.wm.shell.flicker.helpers.ImeAppHelper import com.android.wm.shell.flicker.helpers.FixedAppHelper import com.android.server.wm.flicker.repetitions import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome +import com.android.wm.shell.flicker.helpers.BaseAppHelper.Companion.isShellTransitionsEnabled import com.android.wm.shell.flicker.testapp.Components.PipActivity.EXTRA_ENTER_PIP +import org.junit.Assume.assumeFalse +import org.junit.Before import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -51,6 +54,12 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t private val imeApp = ImeAppHelper(instrumentation) private val testApp = FixedAppHelper(instrumentation) + @Before + open fun setup() { + // Legacy split is having some issue with Shell transition, and will be deprecated soon. + assumeFalse(isShellTransitionsEnabled()) + } + override val transition: FlickerBuilder.(Map) -> Unit get() = { withTestName { testSpec.name }