commit 1b66ee9ca20d32fe64bdf278ec08fb258e90e9a6
author Anna Zhuravleva <azhura@google.com> Tue Aug 29 14:35:28 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 29 14:35:28 2023 +0000
tree f732eb4f0bea8440d9ad278c9aa155dd1eda9586
parent 4f5cb1b3b5bc6b062354ba9fca7775d8f9e42d12
parent 3f11e9d87c6f2920afb2d60ba3f2a48ffa1c566c

Merge "Use androidx Flaky annotation for device tests." into main

services/core/java/com/android/server/appop/TEST_MAPPING

diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING
index 68062b5..65f6af7 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"

services/core/java/com/android/server/pm/permission/TEST_MAPPING

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 b2dcf37..24323c8 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"

services/permission/TEST_MAPPING

diff --git a/services/permission/TEST_MAPPING b/services/permission/TEST_MAPPING
index b2dcf37..24323c8 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"