diff options
| author | 2023-08-18 10:36:06 +0000 | |
|---|---|---|
| committer | 2023-08-18 10:36:06 +0000 | |
| commit | 3f11e9d87c6f2920afb2d60ba3f2a48ffa1c566c (patch) | |
| tree | 48a8445d53d572ef5fe4754fcf565eb16dfb6e04 | |
| parent | 9da1aaeb79c64352a2f1b7ff5e72af0dbaa7f122 (diff) | |
Use androidx Flaky annotation for device tests.
Platform_testing flaky annotation is for
host side tests and will be restricted, device
tests should use androidx annotation.
Bug: 293837621
Test: build
Change-Id: I7fe9deb19194cefe1b8e2a7e2b9ea258c1086e0f
| -rw-r--r-- | services/core/java/com/android/server/appop/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | services/permission/TEST_MAPPING | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING index 68062b566906..65f6af7d0309 100644 --- a/services/core/java/com/android/server/appop/TEST_MAPPING +++ b/services/core/java/com/android/server/appop/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsAppOpsTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -31,7 +31,7 @@ "name": "CtsPermissionTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permission.cts.BackgroundPermissionsTest" diff --git a/services/core/java/com/android/server/pm/permission/TEST_MAPPING b/services/core/java/com/android/server/pm/permission/TEST_MAPPING index b2dcf379fe7d..24323c8bfbde 100644 --- a/services/core/java/com/android/server/pm/permission/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/permission/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsPermissionTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permission.cts.BackgroundPermissionsTest" @@ -32,7 +32,7 @@ "name": "CtsPermissionPolicyTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest" diff --git a/services/permission/TEST_MAPPING b/services/permission/TEST_MAPPING index b2dcf379fe7d..24323c8bfbde 100644 --- a/services/permission/TEST_MAPPING +++ b/services/permission/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsPermissionTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permission.cts.BackgroundPermissionsTest" @@ -32,7 +32,7 @@ "name": "CtsPermissionPolicyTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest" |