summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PermissionController/TEST_MAPPING62
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING36
-rw-r--r--PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING17
-rw-r--r--PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING12
-rw-r--r--SafetyCenter/Config/TEST_MAPPING10
-rw-r--r--framework-s/java/android/app/role/TEST_MAPPING17
-rw-r--r--service/java/com/android/role/TEST_MAPPING17
-rw-r--r--tests/cts/permissionui/TEST_MAPPING12
-rw-r--r--tests/cts/role/TEST_MAPPING17
-rw-r--r--tests/cts/safetycenter/TEST_MAPPING10
-rw-r--r--tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING10
-rw-r--r--tests/functional/safetycenter/singleuser/TEST_MAPPING10
-rw-r--r--tests/functional/safetycenter/subpages/TEST_MAPPING10
-rw-r--r--tests/hostside/safetycenter/TEST_MAPPING7
14 files changed, 244 insertions, 3 deletions
diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING
index 084670e76..a34a16034 100644
--- a/PermissionController/TEST_MAPPING
+++ b/PermissionController/TEST_MAPPING
@@ -93,6 +93,68 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsRoleTestCases",
+ "options": [
+ // TODO(b/238677748): These two tests currently fails on R base image
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#openDefaultAppListThenIsNotDefaultAppInList"
+ },
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ],
+ "file_patterns": ["res/xml/roles\\.xml"]
+ },
+ {
+ "name": "PermissionControllerMockingTests",
+ "options": [
+ {
+ "include-filter": "com.android.permissioncontroller.tests.mocking.role.model.RoleParserTest"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ],
+ "file_patterns": ["res/xml/roles\\.xml"]
+ },
+ {
+ "name": "PermissionUiTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ },
+ // TODO(b/238773220): These tests currently fails on R base image
+ {
+ "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsGranted"
+ },
+ {
+ "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsRevoked"
+ },
+ {
+ "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenAppGetsInstalled"
+ },
+ {
+ "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenDefinerGetsUninstalled"
+ },
+ {
+ "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenUserGetsUninstalled"
+ }
+ ]
+ },
+ {
+ "name": "CtsPermissionUiTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsRoleTestCases",
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING
index 38d46fe76..7ec419864 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING
+++ b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING
@@ -71,6 +71,42 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsPermissionTestCases",
+ "options": [
+ {
+ "include-filter": "android.permission.cts.BackgroundPermissionsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.LocationAccessCheckTest"
+ },
+ {
+ "include-filter": "android.permission.cts.NotificationListenerCheckTest"
+ },
+ {
+ "include-filter": "android.permission.cts.OneTimePermissionTest"
+ },
+ {
+ "include-filter": "android.permission.cts.PermissionControllerTest"
+ },
+ {
+ "include-filter": "android.permission.cts.PlatformPermissionGroupMappingTest"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsHibernationTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsHibernationTestCases"
diff --git a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING
index 01d04bea0..46b148e68 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING
+++ b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING
@@ -26,6 +26,23 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsRoleTestCases",
+ "options": [
+ // TODO(b/238677748): These two tests currently fails on R base image
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#openDefaultAppListThenIsNotDefaultAppInList"
+ },
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsRoleTestCases"
diff --git a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING
index 1503c5e57..35885d0c3 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING
+++ b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING
@@ -29,6 +29,16 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsPermissionUiTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "PermissionControllerMockingTests",
@@ -47,4 +57,4 @@
"name": "CtsPermissionUiTestCases[com.google.android.permission.apex]"
}
]
-} \ No newline at end of file
+}
diff --git a/SafetyCenter/Config/TEST_MAPPING b/SafetyCenter/Config/TEST_MAPPING
index d8a356636..1ad65fddd 100644
--- a/SafetyCenter/Config/TEST_MAPPING
+++ b/SafetyCenter/Config/TEST_MAPPING
@@ -13,5 +13,15 @@
}
]
}
+ ],
+ "permission-mainline-presubmit": [
+ {
+ "name": "SafetyCenterConfigTests",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
]
}
diff --git a/framework-s/java/android/app/role/TEST_MAPPING b/framework-s/java/android/app/role/TEST_MAPPING
index 01d04bea0..46b148e68 100644
--- a/framework-s/java/android/app/role/TEST_MAPPING
+++ b/framework-s/java/android/app/role/TEST_MAPPING
@@ -26,6 +26,23 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsRoleTestCases",
+ "options": [
+ // TODO(b/238677748): These two tests currently fails on R base image
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#openDefaultAppListThenIsNotDefaultAppInList"
+ },
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsRoleTestCases"
diff --git a/service/java/com/android/role/TEST_MAPPING b/service/java/com/android/role/TEST_MAPPING
index 45cf62ff7..e0e1160d8 100644
--- a/service/java/com/android/role/TEST_MAPPING
+++ b/service/java/com/android/role/TEST_MAPPING
@@ -34,6 +34,23 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsRoleTestCases",
+ "options": [
+ // TODO(b/238677748): These two tests currently fails on R base image
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#openDefaultAppListThenIsNotDefaultAppInList"
+ },
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsAppSecurityHostTestCases",
diff --git a/tests/cts/permissionui/TEST_MAPPING b/tests/cts/permissionui/TEST_MAPPING
index c703c539d..444b1d5d9 100644
--- a/tests/cts/permissionui/TEST_MAPPING
+++ b/tests/cts/permissionui/TEST_MAPPING
@@ -19,6 +19,16 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsPermissionUiTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsPermissionUiTestCases"
@@ -29,4 +39,4 @@
"name": "CtsPermissionUiTestCases[com.google.android.permission.apex]"
}
]
-} \ No newline at end of file
+}
diff --git a/tests/cts/role/TEST_MAPPING b/tests/cts/role/TEST_MAPPING
index 01d04bea0..46b148e68 100644
--- a/tests/cts/role/TEST_MAPPING
+++ b/tests/cts/role/TEST_MAPPING
@@ -26,6 +26,23 @@
]
}
],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsRoleTestCases",
+ "options": [
+ // TODO(b/238677748): These two tests currently fails on R base image
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#openDefaultAppListThenIsNotDefaultAppInList"
+ },
+ {
+ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ],
"postsubmit": [
{
"name": "CtsRoleTestCases"
diff --git a/tests/cts/safetycenter/TEST_MAPPING b/tests/cts/safetycenter/TEST_MAPPING
index b1f60307b..3bdba6266 100644
--- a/tests/cts/safetycenter/TEST_MAPPING
+++ b/tests/cts/safetycenter/TEST_MAPPING
@@ -13,5 +13,15 @@
}
]
}
+ ],
+ "permission-mainline-presubmit": [
+ {
+ "name": "CtsSafetyCenterTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
]
}
diff --git a/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING b/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING
index dcc2f817f..a7ffdf96d 100644
--- a/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING
+++ b/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING
@@ -13,5 +13,15 @@
}
]
}
+ ],
+ "permission-mainline-presubmit": [
+ {
+ "name": "SafetyCenterActivityFunctionalTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
]
}
diff --git a/tests/functional/safetycenter/singleuser/TEST_MAPPING b/tests/functional/safetycenter/singleuser/TEST_MAPPING
index 9ba98a87a..3eec3e812 100644
--- a/tests/functional/safetycenter/singleuser/TEST_MAPPING
+++ b/tests/functional/safetycenter/singleuser/TEST_MAPPING
@@ -13,5 +13,15 @@
}
]
}
+ ],
+ "permission-mainline-presubmit": [
+ {
+ "name": "SafetyCenterFunctionalTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
]
}
diff --git a/tests/functional/safetycenter/subpages/TEST_MAPPING b/tests/functional/safetycenter/subpages/TEST_MAPPING
index e6802586e..097a99612 100644
--- a/tests/functional/safetycenter/subpages/TEST_MAPPING
+++ b/tests/functional/safetycenter/subpages/TEST_MAPPING
@@ -13,5 +13,15 @@
}
]
}
+ ],
+ "permission-mainline-presubmit": [
+ {
+ "name": "SafetyCenterSubpagesTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
]
}
diff --git a/tests/hostside/safetycenter/TEST_MAPPING b/tests/hostside/safetycenter/TEST_MAPPING
index ba303cf90..798c5e485 100644
--- a/tests/hostside/safetycenter/TEST_MAPPING
+++ b/tests/hostside/safetycenter/TEST_MAPPING
@@ -8,5 +8,10 @@
{
"name": "SafetyCenterHostSideTestCases[com.google.android.permission.apex]"
}
+ ],
+ "permission-mainline-presubmit": [
+ {
+ "name": "SafetyCenterHostSideTestCases"
+ }
]
-} \ No newline at end of file
+}