diff options
| author | 2023-09-29 09:52:36 +0000 | |
|---|---|---|
| committer | 2023-09-29 09:52:36 +0000 | |
| commit | 87d619ceb8e175bf775f484857e31b0c3b3ff044 (patch) | |
| tree | a15634b90dd4c6e6e5297597c1aec894c8e0d09d | |
| parent | a681f86df44beb0e0840314dde5ef97413bdf1a0 (diff) | |
| parent | 0adc7f91b2be72724e624dd6ea8822bf69db8124 (diff) | |
Merge "Use androidx FlakyTest annotation for device tests." into main
| -rw-r--r-- | media/java/android/media/projection/TEST_MAPPING | 3 | ||||
| -rw-r--r-- | tests/utils/testutils/TEST_MAPPING | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/media/java/android/media/projection/TEST_MAPPING b/media/java/android/media/projection/TEST_MAPPING index a792498b8521..7aa9118e45ee 100644 --- a/media/java/android/media/projection/TEST_MAPPING +++ b/media/java/android/media/projection/TEST_MAPPING @@ -4,9 +4,6 @@ "name": "MediaProjectionTests", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - { "exclude-annotation": "androidx.test.filters.FlakyTest" }, { diff --git a/tests/utils/testutils/TEST_MAPPING b/tests/utils/testutils/TEST_MAPPING index 6468d8cc99a6..52fd5a8779ad 100644 --- a/tests/utils/testutils/TEST_MAPPING +++ b/tests/utils/testutils/TEST_MAPPING @@ -7,9 +7,6 @@ "exclude-annotation": "androidx.test.filters.LargeTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - { "exclude-annotation": "androidx.test.filters.FlakyTest" }, { |