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

Commit 5ee3398b authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Drive-by clean-up: remove redundant operation 

markProfileOwnerOnOrganizationOwnedDeviceUncheckedLocked sets
DISALLOW_REMOVE_MANAGED_PROFILE restriction on parent profil,
so doing it again in restrictRemovalOfManagedProfile is
unnecessary.

Bug: 162815601
Test: enroll TestDPC into COPE from SuW, check the profile cannot be
      removed.
Change-Id: Ie50c0cfa8affad58759ad3dd01963bb7edccf720
parent 1b2c6656

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

+3 −17
Original line number Diff line number Diff line
@@ -16774,7 +16774,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                    provisioningParams.isKeepAccountMigrated(), callerPackage);















            if (provisioningParams.isOrganizationOwnedProvisioning()) {













                setProfileOwnerOnOrgOwnedDeviceState(admin, userInfo.id, caller.getUserId());













                synchronized (getLockObject()) {













                    markProfileOwnerOnOrganizationOwnedDeviceUncheckedLocked(admin, userInfo.id);













                }















            }





























            return userInfo.getUserHandle();










@@ -17006,22 +17008,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }















    }



























    private void setProfileOwnerOnOrgOwnedDeviceState(













            ComponentName admin, @UserIdInt int profileId, @UserIdInt int parentUserId) {













        synchronized (getLockObject()) {













            markProfileOwnerOnOrganizationOwnedDeviceUncheckedLocked(admin, profileId);













        }













        restrictRemovalOfManagedProfile(parentUserId);













    }

























    private void restrictRemovalOfManagedProfile(@UserIdInt int parentUserId) {













        final UserHandle parentUserHandle = UserHandle.of(parentUserId);













        mUserManager.setUserRestriction(













                UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,













                /* value= */ true,













                parentUserHandle);













    }



























    @Override















    public void provisionFullyManagedDevice(















            @NonNull FullyManagedDeviceProvisioningParams provisioningParams,