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

Merge "Clear user restriction for managed profiles when the user is deleted." into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-03-11 20:56:53 +00:00
committed by Android (Google) Code Review
parent 81048dfd0c 859b914c6e
commit 472e038e4e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2237,6 +2237,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
isOrgOwned = mOwners.isProfileOwnerOfOrganizationOwnedDevice(userHandle); isOrgOwned = mOwners.isProfileOwnerOfOrganizationOwnedDevice(userHandle);
// Clear any restrictions set by the a profile owner and the parent admin.
final ActiveAdmin admin = getProfileOwnerLocked(userHandle);
if (admin != null) {
admin.userRestrictions = null;
final ActiveAdmin parentAdmin = admin.getParentActiveAdmin();
if (parentAdmin != null) {
parentAdmin.userRestrictions = null;
}
pushUserRestrictions(userHandle);
}
mOwners.removeProfileOwner(userHandle); mOwners.removeProfileOwner(userHandle);
mOwners.writeProfileOwner(userHandle); mOwners.writeProfileOwner(userHandle);
pushScreenCapturePolicy(userHandle); pushScreenCapturePolicy(userHandle);