summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PermissionController/TEST_MAPPING9
-rw-r--r--PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING9
-rw-r--r--TEST_MAPPING3
-rw-r--r--framework-s/java/android/app/role/TEST_MAPPING9
-rw-r--r--service/java/com/android/role/TEST_MAPPING9
5 files changed, 39 insertions, 0 deletions
diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING
index a34a16034..13f243d81 100644
--- a/PermissionController/TEST_MAPPING
+++ b/PermissionController/TEST_MAPPING
@@ -13,6 +13,9 @@
"file_patterns": ["res/xml/roles\\.xml"]
},
{
+ "name": "CtsRoleMultiUserTestCases"
+ },
+ {
"name": "PermissionUiTestCases",
"options": [
{
@@ -49,6 +52,9 @@
"file_patterns": ["res/xml/roles\\.xml"]
},
{
+ "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]"
+ },
+ {
"name": "PermissionControllerMockingTests[com.google.android.permission.apex]",
"options": [
{
@@ -111,6 +117,9 @@
"file_patterns": ["res/xml/roles\\.xml"]
},
{
+ "name": "CtsRoleMultiUserTestCases"
+ },
+ {
"name": "PermissionControllerMockingTests",
"options": [
{
diff --git a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING
index 93ad3d31b..83b513c04 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING
+++ b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING
@@ -7,6 +7,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases"
}
],
"mainline-presubmit": [
@@ -24,6 +27,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]"
}
],
"permission-mainline-presubmit": [
@@ -41,6 +47,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases"
}
],
"postsubmit": [
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 823738181..5c6f04426 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -45,6 +45,9 @@
"name" : "CtsRoleTestCases"
},
{
+ "name" : "CtsRoleMultiUserTestCases"
+ },
+ {
"name" : "CtsPermissionMultiUserTestCases"
},
{
diff --git a/framework-s/java/android/app/role/TEST_MAPPING b/framework-s/java/android/app/role/TEST_MAPPING
index 46b148e68..62c07e5d9 100644
--- a/framework-s/java/android/app/role/TEST_MAPPING
+++ b/framework-s/java/android/app/role/TEST_MAPPING
@@ -7,6 +7,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases"
}
],
"mainline-presubmit": [
@@ -24,6 +27,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]"
}
],
"permission-mainline-presubmit": [
@@ -41,6 +47,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases"
}
],
"postsubmit": [
diff --git a/service/java/com/android/role/TEST_MAPPING b/service/java/com/android/role/TEST_MAPPING
index e0e1160d8..720330f82 100644
--- a/service/java/com/android/role/TEST_MAPPING
+++ b/service/java/com/android/role/TEST_MAPPING
@@ -15,6 +15,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases"
}
],
"mainline-presubmit": [
@@ -32,6 +35,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]"
}
],
"permission-mainline-presubmit": [
@@ -49,6 +55,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "CtsRoleMultiUserTestCases"
}
],
"postsubmit": [