From d7aed4b1cbf5ef779162e4a4f7fca0148d6cff5b Mon Sep 17 00:00:00 2001 From: Jonathan Scott Date: Thu, 6 Apr 2023 07:26:19 +0000 Subject: [PATCH] Fix global user restriction permission check. Test: a.d.c.BluetoothTest Bug: 274710659 Change-Id: I3983803717a58f24fdaed79557b7bc51fba65ff6 --- .../server/devicepolicy/DevicePolicyManagerService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 08defd25a42b8..8fd63a8f67748 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -13295,7 +13295,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { /* who= */ null, key, caller.getPackageName(), - caller.getUserId() + UserHandle.USER_ALL ); setGlobalUserRestrictionInternal(admin, key, /* enabled= */ true); @@ -22550,7 +22550,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { ); /** - * All the permisisons granted to a profile owner. + * All the permissions granted to a profile owner. */ private static final List PROFILE_OWNER_PERMISSIONS = List.of( @@ -22560,6 +22560,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, MANAGE_DEVICE_POLICY_AUTOFILL, + MANAGE_DEVICE_POLICY_BLUETOOTH, MANAGE_DEVICE_POLICY_CALLS, MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES, MANAGE_DEVICE_POLICY_DISPLAY, @@ -22596,7 +22597,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { MANAGE_DEVICE_POLICY_ACROSS_USERS, MANAGE_DEVICE_POLICY_AIRPLANE_MODE, MANAGE_DEVICE_POLICY_APPS_CONTROL, - MANAGE_DEVICE_POLICY_BLUETOOTH, MANAGE_DEVICE_POLICY_CAMERA, MANAGE_DEVICE_POLICY_CERTIFICATES, MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, @@ -22623,7 +22623,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private static final List ADDITIONAL_PROFILE_OWNER_ON_USER_0_PERMISSIONS = List.of( MANAGE_DEVICE_POLICY_AIRPLANE_MODE, - MANAGE_DEVICE_POLICY_BLUETOOTH, MANAGE_DEVICE_POLICY_CAMERA, MANAGE_DEVICE_POLICY_DISPLAY, MANAGE_DEVICE_POLICY_FUN,