diff options
| author | 2025-01-15 15:40:08 -0800 | |
|---|---|---|
| committer | 2025-01-15 15:40:08 -0800 | |
| commit | c585670e2e3ec967305a63b25da13c9331d97256 (patch) | |
| tree | 935df17a510d06393e6a28c76e0d84fbd598928f | |
| parent | 46de7db3752c6ef2554b28bea5086ce2682d1780 (diff) | |
| parent | 25cc914dc678eaf7ff0f3d19c725abfa49d3de90 (diff) | |
Merge "Add Wear presubmit for PermissionController" into main
| -rw-r--r-- | PermissionController/TEST_MAPPING | 18 | ||||
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/wear/TEST_MAPPING | 22 |
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 |