diff options
| author | 2025-03-21 12:50:49 -0700 | |
|---|---|---|
| committer | 2025-03-21 18:02:14 -0700 | |
| commit | 4dba829e8bcc13977441e8295434c5ec602f8b60 (patch) | |
| tree | b55c2e10fc583e1c6b6dfbab0ba6e8618f64b405 /PermissionController | |
| parent | 8357002922ece75f74a734310844ee439f2b0d7c (diff) | |
Permissions: Fix admin restricted CTS Test.
The PermissionUsageViewModelTest in the test suite was adding a health permission to the platform list which was causing the HEALTH permission group to be considered restricted. When we checked with the group it would then always return restricted even before we added the permission we were checking to the list.
Now we remove the explicit group from being passed in. The point of this test is mostly to ensure that permissions that are added to the list become restricted rather than being about health specifically. The inprocess tests cover the health permissions getting added.
Bug: 403921690
Test: atest PermissionControllerMockingTests
Flag: EXEMPT bugfix
Relnote: N/A
LOW_COVERAGE_REASON=TEST_ONLY
Change-Id: Ibba609dbe28c637206f17f375e273888d565f5c9
Diffstat (limited to 'PermissionController')
| -rw-r--r-- | PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt | 13 |
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, |