Use only @FlakyTest annotations on FlickerTests
Currently the FlickerTests tests do not work with @FlakyTest annotation, depending instead on @Ignore. Fix dependencies so that it requires only @FlakyTest annotations now.
Test: atest FlickerTests
Change-Id: If762c5d9f9844885fbd998177512decb08dcf125
diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml
index 58df2a8..68c99a3 100644
--- a/tests/FlickerTests/AndroidTest.xml
+++ b/tests/FlickerTests/AndroidTest.xml
@@ -27,7 +27,7 @@
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
<option name="package" value="com.android.server.wm.flicker"/>
- <option name="exclude-annotation" value="org.junit.Ignore" />
+ <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />
<option name="shell-timeout" value="6600s" />
<option name="test-timeout" value="6000s" />
<option name="hidden-api-checks" value="false" />