diff options
| -rw-r--r-- | core/java/android/app/TEST_MAPPING | 2 | ||||
| -rw-r--r-- | core/java/android/os/TEST_MAPPING | 3 | ||||
| -rw-r--r-- | core/java/android/service/notification/TEST_MAPPING | 6 | ||||
| -rw-r--r-- | core/java/android/text/TEST_MAPPING | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/infra/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | core/tests/vibrator/TEST_MAPPING | 1 |
6 files changed, 4 insertions, 14 deletions
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING index 315a0556042a..a29c196d88de 100644 --- a/core/java/android/app/TEST_MAPPING +++ b/core/java/android/app/TEST_MAPPING @@ -19,7 +19,7 @@ "name": "CtsAppOpsTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING index ad3abd9b531c..2d6e09a1b268 100644 --- a/core/java/android/os/TEST_MAPPING +++ b/core/java/android/os/TEST_MAPPING @@ -8,7 +8,6 @@ "name": "FrameworksVibratorCoreTests", "options": [ {"exclude-annotation": "androidx.test.filters.LargeTest"}, - {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, {"exclude-annotation": "androidx.test.filters.FlakyTest"}, {"exclude-annotation": "org.junit.Ignore"} ] @@ -21,7 +20,6 @@ "name": "FrameworksVibratorServicesTests", "options": [ {"exclude-annotation": "androidx.test.filters.LargeTest"}, - {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, {"exclude-annotation": "androidx.test.filters.FlakyTest"}, {"exclude-annotation": "org.junit.Ignore"} ] @@ -34,7 +32,6 @@ "name": "CtsVibratorTestCases", "options": [ {"exclude-annotation": "androidx.test.filters.LargeTest"}, - {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, {"exclude-annotation": "androidx.test.filters.FlakyTest"}, {"exclude-annotation": "org.junit.Ignore"} ] diff --git a/core/java/android/service/notification/TEST_MAPPING b/core/java/android/service/notification/TEST_MAPPING index 7b8d52f51cee..468c4518602e 100644 --- a/core/java/android/service/notification/TEST_MAPPING +++ b/core/java/android/service/notification/TEST_MAPPING @@ -4,9 +4,6 @@ "name": "CtsNotificationTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - { "exclude-annotation": "androidx.test.filters.FlakyTest" }, { @@ -21,9 +18,6 @@ "name": "FrameworksUiServicesTests", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - { "exclude-annotation": "androidx.test.filters.FlakyTest" }, { diff --git a/core/java/android/text/TEST_MAPPING b/core/java/android/text/TEST_MAPPING index 0fe974afd15c..c9bd2cacb138 100644 --- a/core/java/android/text/TEST_MAPPING +++ b/core/java/android/text/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsTextTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "exclude-annotation": "androidx.test.filters.LargeTest" diff --git a/core/java/com/android/internal/infra/TEST_MAPPING b/core/java/com/android/internal/infra/TEST_MAPPING index ddfd0ed18bef..c09181f2f496 100644 --- a/core/java/com/android/internal/infra/TEST_MAPPING +++ b/core/java/com/android/internal/infra/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsRoleTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -15,7 +15,7 @@ "include-filter": "android.permission.cts.PermissionControllerTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, diff --git a/core/tests/vibrator/TEST_MAPPING b/core/tests/vibrator/TEST_MAPPING index 2f3afa6f6399..54a5ff1d675d 100644 --- a/core/tests/vibrator/TEST_MAPPING +++ b/core/tests/vibrator/TEST_MAPPING @@ -4,7 +4,6 @@ "name": "FrameworksVibratorCoreTests", "options": [ {"exclude-annotation": "androidx.test.filters.LargeTest"}, - {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, {"exclude-annotation": "androidx.test.filters.FlakyTest"}, {"exclude-annotation": "org.junit.Ignore"} ] |