Merge "Disable failing PIP expand assertion" into tm-dev (03465b1e) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt

+13 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group3
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import org.junit.Assume
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -81,9 +83,19 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit
		override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

		/** {@inheritDoc} */
		@FlakyTest(bugId = 197726610)
		@Test
		override fun pipLayerExpands() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		super.pipLayerExpands()
		}

		@Presubmit
		@Test
		override fun pipLayerExpands() = super.pipLayerExpands()
		fun pipLayerExpands_ShellTransit() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		super.pipLayerExpands()
		}

		companion object {
		/**