diff options
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | TEST_MAPPING | 6 | ||||
| -rw-r--r-- | flags/Android.bp | 1 | ||||
| -rw-r--r-- | flags/flags.aconfig | 1 | ||||
| -rw-r--r-- | tests/cts/role/src/android/app/role/cts/RoleManagerTest.java | 1 |
6 files changed, 17 insertions, 0 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING index 5dea9615a..487701204 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING @@ -72,6 +72,10 @@ ], "postsubmit": [ { + // TODO(b/332974906): Replace in presubmit-large. + "name": "CtsDevicePolicyManagerTestCases_Permissions_NoFlakes" + }, + { "name": "CtsPermissionTestCases", "options": [ { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING index 2a4953f51..d0b115bcb 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING @@ -30,6 +30,10 @@ "name": "CtsPermissionUiTestCases" }, { + // TODO(b/332974906): Promote in presubmit-large. + "name": "CtsDevicePolicyManagerTestCases_Permissions_NoFlakes" + }, + { "name": "CtsPermissionTestCases", "options": [ { diff --git a/TEST_MAPPING b/TEST_MAPPING index 689cd6865..e1bfdde7c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -68,5 +68,11 @@ } ] } + ], + "postsubmit" : [ + { + // TODO(b/332974906): Replace in alltests. + "name" : "CtsDevicePolicyManagerTestCases_Permissions" + } ] } diff --git a/flags/Android.bp b/flags/Android.bp index 4f0241f91..675c4a166 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -21,6 +21,7 @@ package { aconfig_declarations { name: "permissions-aconfig-flags", package: "com.android.permission.flags", + container: "com.android.permission", srcs: ["flags.aconfig"], } diff --git a/flags/flags.aconfig b/flags/flags.aconfig index 37aca2a56..ab1ee47b5 100644 --- a/flags/flags.aconfig +++ b/flags/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.permission.flags" +container: "com.android.permission" flag { name: "voice_activation_op_enabled" diff --git a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java index 001a761c2..f3c2c445e 100644 --- a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java +++ b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java @@ -714,6 +714,7 @@ public class RoleManagerTest { pressBack(); } + @FlakyTest(bugId = 333036689, detail = "This test breaches flakiness SLO") @Test public void openDefaultAppListThenIsNotDefaultAppInList() throws Exception { sContext.startActivity(new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) |