Merge "Do not call assumeTrue(isTelevision) in @After"

2020-11-13 16:35:48 +00:00
parent 9079c1754f 327e175409
commit a2b16e18ec
1 changed files with 1 additions and 1 deletions
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt
@@ -52,7 +52,7 @@ abstract class TvPipTestBase(rotationName: String, rotation: Int)

    @After
    open fun tearDown() {
-        Assume.assumeTrue(isTelevision)
+        if (!isTelevision) return

        testApp.forceStop()