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

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

Merge changes from topics "fix3", "fix4" into udc-dev am: 245b979b am: dbd6b8b7 

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



Change-Id: I78b5c3b6f6d936ddbc0744ffc37374105c086d53
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2d57594 dbd6b8b7

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

+6 −5
Original line number Diff line number Diff line
@@ -22261,7 +22261,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES,

            MANAGE_DEVICE_POLICY_USERS,

            MANAGE_DEVICE_POLICY_SAFE_BOOT,

            MANAGE_DEVICE_POLICY_TIME);

            MANAGE_DEVICE_POLICY_TIME,

            MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS);

    private static final List<String> PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS =

            List.of(

                MANAGE_DEVICE_POLICY_ACROSS_USERS,
@@ -22367,7 +22368,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            MANAGE_DEVICE_POLICY_PACKAGE_STATE,

            MANAGE_DEVICE_POLICY_RESET_PASSWORD,

            MANAGE_DEVICE_POLICY_STATUS_BAR,

            MANAGE_DEVICE_POLICY_APP_RESTRICTIONS);

            MANAGE_DEVICE_POLICY_APP_RESTRICTIONS,

            MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS);

    private static final List<String> PROFILE_OWNER_PERMISSIONS  = List.of(

            MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL,

            MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY,
@@ -22506,8 +22508,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCATION,

                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS,

                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MICROPHONE,

                MANAGE_DEVICE_POLICY_ACROSS_USERS);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MOBILE_NETWORK,
@@ -22662,6 +22662,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            hasPermissionOnTargetUser = hasPermission(CROSS_USER_PERMISSIONS.get(permission),

                    callerPackageName);

        }















        return hasPermissionOnOwnUser && hasPermissionOnTargetUser;















    }
























@@ -22702,7 +22703,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        }















        // Check the permission for the role-holder















        if (isCallerDevicePolicyManagementRoleHolder(caller)) {













            return anyDpcHasPermission(permission, mContext.getUserId());













            return anyDpcHasPermission(permission, caller.getUserId());















        }















        if (DELEGATE_SCOPES.containsKey(permission)) {















            return isCallerDelegate(caller, DELEGATE_SCOPES.get(permission));