Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ia62d133f6b610c87769e2a007f2b4536a1f173eb
This commit is contained in:
Rubin Xu
2020-03-25 16:29:54 +00:00
committed by Automerger Merge Worker
parent fc4a9688b3 2d0d3ce038
commit 754d6901be
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -4434,6 +4434,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
clearDeviceOwnerLocked(getDeviceOwnerAdminLocked(), userHandle); clearDeviceOwnerLocked(getDeviceOwnerAdminLocked(), userHandle);
} }
if (isProfileOwner(adminReceiver, 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, final ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver,
userHandle, /* parent */ false); userHandle, /* parent */ false);
clearProfileOwnerLocked(admin, userHandle); clearProfileOwnerLocked(admin, userHandle);