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

Clear user restriction for managed profiles when the user is deleted.

Browse Source 
Bug: 270046713
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testUserRestrictionsSetOnParentAreNotPersisted
Change-Id: I2bdc1dd7dad520568102aea541e075b9423c78bb
This commit is contained in:
Jason Parks
2023-03-08 16:18:39 +00:00
parent 767a9abedf
commit 859b914c6e
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);
// 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.writeProfileOwner(userHandle);
pushScreenCapturePolicy(userHandle);