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

Commit c608b28d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

parents 99254ec0 bfefb2fa

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));