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

Commit 0be00ec2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove limitation that only profiles from the system user can be COPE."

parents 11f93e7b e6d38c3e

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

+0 −6
Original line number Diff line number Diff line
@@ -14705,12 +14705,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (parentUser == null) {

                throw new IllegalStateException(String.format("User %d is not a profile", userId));

            }

            if (!parentUser.isSystem()) {

                throw new IllegalStateException(

                        String.format("Only the profile owner of a managed profile on the"

                                + " primary user can be granted access to device identifiers, not"

                                + " on user %d", parentUser.getIdentifier()));

            }















            mUserManager.setUserRestriction(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,















                    isProfileOwnerOnOrganizationOwnedDevice,