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

Commit 859b914c authored by Jason Parks's avatar Jason Parks
Browse files

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

Bug: 270046713
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testUserRestrictionsSetOnParentAreNotPersisted
Change-Id: I2bdc1dd7dad520568102aea541e075b9423c78bb
parent 767a9abe

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

+10 −0
Original line number Diff line number Diff line
@@ -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);