Merge "Replace profile owner of org owned device enforce methods" (c427a118) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -5745,14 +5745,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		@Override
		public void wipeDataWithReason(int flags, String wipeReasonForUser, boolean parent) {
		public void wipeDataWithReason(int flags, String wipeReasonForUser,
		boolean calledOnParentInstance) {
		if (!mHasFeature) {
		return;
		}
		final CallerIdentity caller = getCallerIdentity();
		boolean calledByProfileOwnerOnOrgOwnedDevice =
		isProfileOwnerOfOrganizationOwnedDevice(caller);
		if (parent) {
		if (calledOnParentInstance) {
		Preconditions.checkCallAuthorization(calledByProfileOwnerOnOrgOwnedDevice,
		"Wiping the entire device can only be done by a profile owner on "
		+ "organization-owned device.");
		@@ -5772,7 +5773,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		String.format("No active admin for user %d", caller.getUserId()));

		if (TextUtils.isEmpty(wipeReasonForUser)) {
		if (calledByProfileOwnerOnOrgOwnedDevice && !parent) {
		if (calledByProfileOwnerOnOrgOwnedDevice && !calledOnParentInstance) {
		wipeReasonForUser = mContext.getString(R.string.device_ownership_relinquished);
		} else {
		wipeReasonForUser = mContext.getString(
		@@ -5783,7 +5784,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		int userId = admin.getUserHandle().getIdentifier();
		if (calledByProfileOwnerOnOrgOwnedDevice) {
		// When wipeData is called on the parent instance, it implies wiping the entire device.
		if (parent) {
		if (calledOnParentInstance) {
		userId = UserHandle.USER_SYSTEM;
		} else {
		// when wipeData is _not_ called on the parent instance, it implies relinquishing
		@@ -5808,7 +5809,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		.createEvent(DevicePolicyEnums.WIPE_DATA_WITH_REASON)
		.setAdmin(admin.info.getComponent())
		.setInt(flags)
		.setStrings(parent ? CALLED_FROM_PARENT : NOT_CALLED_FROM_PARENT)
		.setStrings(calledOnParentInstance ? CALLED_FROM_PARENT : NOT_CALLED_FROM_PARENT)
		.write();
		String internalReason = String.format(
		"DevicePolicyManager.wipeDataWithReason() from %s, organization-owned? %s",
		@@ -9527,8 +9528,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		&& UserRestrictionsUtils.canProfileOwnerChange(key, userHandle);
		boolean orgOwnedProfileOwnerCanChangesGlobally = parent
		&& isProfileOwnerOfOrganizationOwnedDevice(caller)
		&& UserRestrictionsUtils
		.canProfileOwnerOfOrganizationOwnedDeviceChange(key);
		&& UserRestrictionsUtils.canProfileOwnerOfOrganizationOwnedDeviceChange(
		key);

		if (!profileOwnerCanChangeOnItself && !orgOwnedProfileOwnerCanChangesGlobally) {
		throw new SecurityException("Profile owner cannot set user restriction " + key);