Add Wear presubmit for PermissionController

Bug: 390227037
Change-Id: If3c834e38196a34dd0843cd7e6355cd801252643
Test: presubmit
Relnote: added Wear presubmit tests via test mapping
LOW_COVERAGE_REASON=NON_CODE_ONLY
Flag: EXEMPT test mapping change only

2 files changed, 18 insertions, 22 deletions

diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING
index 13f243d81..508105c46 100644
--- a/PermissionController/TEST_MAPPING
+++ b/PermissionController/TEST_MAPPING
@@ -224,6 +224,24 @@
             "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]"
         }
     ],
+    "wear-presubmit": [
+        {
+            "name": "CtsPermissionUiTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ]
+        },
+        {
+            "name": "CtsRoleTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ]
+        }
+    ],
     "imports": [
         {
             "path": "vendor/xts/gts-tests/hostsidetests/permissioncontroller"
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/TEST_MAPPING
deleted file mode 100644
index 3cc91855d..000000000
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/TEST_MAPPING
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "wear-presubmit": [
-        {
-            // See b/387705174 for context
-            "name": "CtsPermissionUiTestCases",
-            "options": [
-                {
-                    // Flaky
-                    "exclude-filter": "android.permissionui.cts.PermissionTest22#testNoRuntimePrompt"
-                },
-                {
-                    // Flaky
-                    "exclude-filter": "android.permissionui.cts.NotificationPermissionTest"
-                },
-                {
-                    // Flaky
-                    "exclude-filter": "android.permissionui.cts.EnhancedConfirmationManagerTest"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file