Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad11795f authored Jun 25, 2025 by Nataniel Borges

Remove FlickerServiceCompatible annotation

It makes the test setup run even when the test is filtered out

Bug: 311643481
Flag: TEST_ONLY
Test: atest FlickerTests
Change-Id: I35a207abd12f78f40db866b4b7c13a6aa5c9e7bc

parent 0bb87e65

tests/FlickerTests/AppClose/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.server.wm.flicker.close

		import android.platform.test.annotations.RequiresDevice
		import android.tools.flicker.annotation.FlickerServiceCompatible
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		@@ -71,7 +70,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		* ```
		*/
		@FlickerServiceCompatible
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

tests/FlickerTests/AppClose/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.server.wm.flicker.close

		import android.platform.test.annotations.RequiresDevice
		import android.tools.flicker.annotation.FlickerServiceCompatible
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		@@ -71,7 +70,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		* ```
		*/
		@FlickerServiceCompatible
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

tests/FlickerTests/AppLaunch/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdTest.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -18,8 +18,7 @@ package com.android.server.wm.flicker.launch

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresDevice
		import android.tools.flicker.annotation.FlickerServiceCompatible
		import androidx.test.filters.RequiresDevice
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		@@ -54,7 +53,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		* ```
		*/
		@FlickerServiceCompatible
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

tests/FlickerTests/AppLaunch/src/com/android/server/wm/flicker/launch/OpenAppFromIntentWarmTest.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		package com.android.server.wm.flicker.launch

		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresDevice
		import android.tools.flicker.annotation.FlickerServiceCompatible
		import androidx.test.filters.RequiresDevice
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		@@ -54,7 +53,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		* ```
		*/
		@FlickerServiceCompatible
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

tests/FlickerTests/AppLaunch/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresDevice
		import android.tools.NavBar
		import android.tools.Rotation
		import android.tools.flicker.annotation.FlickerServiceCompatible
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.LegacyFlickerTest
		import android.tools.flicker.legacy.LegacyFlickerTestFactory
		@@ -60,7 +59,6 @@ import org.junit.runners.Parameterized
		* ```
		*/
		@RequiresDevice
		@FlickerServiceCompatible
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)