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

Commit 754d6901 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Clear no_remove_managed_profile retriction when removing test PO" into... 

Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a am: 2d0d3ce0

Change-Id: Ia62d133f6b610c87769e2a007f2b4536a1f173eb
parents fc4a9688 2d0d3ce0

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

+5 −0
Original line number Diff line number Diff line
@@ -4434,6 +4434,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                    clearDeviceOwnerLocked(getDeviceOwnerAdminLocked(), userHandle);

                }

                if (isProfileOwner(adminReceiver, userHandle)) {

                    if (isProfileOwnerOfOrganizationOwnedDevice(userHandle)) {

                        mUserManager.setUserRestriction(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,

                                false,

                                UserHandle.of(getProfileParentId(userHandle)));

                    }

                    final ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver,

                            userHandle, /* parent */ false);

                    clearProfileOwnerLocked(admin, userHandle);