diff options
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index d65a28d47e10..8274e380c89a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -16771,7 +16771,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(); @@ -17003,22 +17005,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, |