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

Commit 245b979b authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge changes from topics "fix3", "fix4" into udc-dev 

* changes:
  Fix issue with DPMRH when on not-user-zero.
  [frameworks/base] Fix issues in PasswordTest
parents 5ff3c730 65b4683e

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

+6 −5
Original line number Diff line number Diff line
@@ -22264,7 +22264,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,
@@ -22370,7 +22371,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,
@@ -22509,8 +22511,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,
@@ -22665,6 +22665,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            hasPermissionOnTargetUser = hasPermission(CROSS_USER_PERMISSIONS.get(permission),

                    callerPackageName);

        }















        return hasPermissionOnOwnUser && hasPermissionOnTargetUser;















    }
























@@ -22705,7 +22706,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));