Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b21f3b1 authored by Jonathan Scott's avatar Jonathan Scott Committed by Automerger Merge Worker
Browse files

Merge changes from topics "bluetoothrestrictions", "headlessfixes2" into udc-dev am: 9d319e4d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22507663



Change-Id: Ia708a0bc7826732c9765f71076e5a793663863c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2851510d 9d319e4d

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −4
Original line number Diff line number Diff line
@@ -13318,7 +13318,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                /* who= */ null,

                key,

                caller.getPackageName(),

                caller.getUserId()

                UserHandle.USER_ALL

        );















        setGlobalUserRestrictionInternal(admin, key, /* enabled= */ true);










@@ -22561,7 +22561,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<String> PROFILE_OWNER_PERMISSIONS  =















            List.of(









@@ -22571,6 +22571,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,










@@ -22607,7 +22608,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,









@@ -22634,7 +22634,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













    private static final List<String> 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,