summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Lannin <jlannin@google.com> 2025-03-21 18:02:34 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-21 18:02:34 -0700
commit6171beb2c5dfd308e78bcf8b424158b958ef737e (patch)
treec3fad27b42ab1162b94da05f0bca6f0dddb30446
parent0ee3e3832d76927465e054cc4716b72033cea0ec (diff)
parent4dba829e8bcc13977441e8295434c5ec602f8b60 (diff)
Merge "Permissions: Fix admin restricted CTS Test." into main
-rw-r--r--PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt13
1 files changed, 6 insertions, 7 deletions
diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt
index 35543b6f1..4d94d8c1c 100644
--- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt
+++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt
@@ -114,24 +114,23 @@ object AdminRestrictedPermissionsUtilsTest {
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA)
@RequiresFlagsEnabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED)
fun addAdminRestrictedPermission_addsPermissionToRestrictedList() {
+ val exampleHealthPermission = "test.permission.health"
var canGrant =
AdminRestrictedPermissionsUtils.mayAdminGrantPermission(
- HealthPermissions.READ_HEART_RATE,
- HealthPermissions.HEALTH_PERMISSION_GROUP,
+ exampleHealthPermission,
+ /* group= */ null,
/* canAdminGrantSensorsPermissions= */ false,
/* isManagedProfile= */ false,
dpm,
)
assertEquals(true, canGrant)
- AdminRestrictedPermissionsUtils.addAdminRestrictedPermission(
- HealthPermissions.READ_HEART_RATE
- )
+ AdminRestrictedPermissionsUtils.addAdminRestrictedPermission(exampleHealthPermission)
canGrant =
AdminRestrictedPermissionsUtils.mayAdminGrantPermission(
- HealthPermissions.READ_HEART_RATE,
- HealthPermissions.HEALTH_PERMISSION_GROUP,
+ exampleHealthPermission,
+ /* group= */ null,
/* canAdminGrantSensorsPermissions= */ false,
/* isManagedProfile= */ false,
dpm,