Merge "Restrict creation of secondary users" into rvc-dev am: 80542add04 (4223a3f0) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -635,10 +635,11 @@ public class UserManager {

		/**
		* Specifies if a user is disallowed from adding new users. This can only be set by device
		* owners, profile owners on the primary user or profile owners of organization-owned managed
		* profiles on the parent profile. The default value is <code>false</code>.
		* owners or profile owners on the primary user. The default value is <code>false</code>.
		* <p>This restriction has no effect on secondary users and managed profiles since only the
		* primary user can add other users.
		* <p> When the device is an organization-owned device provisioned with a managed profile,
		* this restriction will be set as a base restriction which cannot be removed by any admin.
		*
		* <p>Key for user restrictions.
		* <p>Type: Boolean

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,6 @@ public class UserRestrictionsUtils {
		Sets.newArraySet(
		UserManager.DISALLOW_CONFIG_DATE_TIME,
		UserManager.DISALLOW_CAMERA,
		UserManager.DISALLOW_ADD_USER,
		UserManager.DISALLOW_BLUETOOTH,
		UserManager.DISALLOW_BLUETOOTH_SHARING,
		UserManager.DISALLOW_CONFIG_CELL_BROADCASTS,

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -4567,9 +4567,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}
		if (isProfileOwner(adminReceiver, userHandle)) {
		if (isProfileOwnerOfOrganizationOwnedDevice(userHandle)) {
		UserHandle parentUserHandle = UserHandle.of(getProfileParentId(userHandle));
		mUserManager.setUserRestriction(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,
		false,
		UserHandle.of(getProfileParentId(userHandle)));
		false, parentUserHandle);
		mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_USER,
		false, parentUserHandle);
		}
		final ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver,
		userHandle, /* parent */ false);
		@@ -7213,6 +7215,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		mUserManager.setUserRestriction(
		UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, false,
		UserHandle.SYSTEM);
		mUserManager.setUserRestriction(
		UserManager.DISALLOW_ADD_USER, false, UserHandle.SYSTEM);

		// Device-wide policies set by the profile owner need to be cleaned up here.
		mLockPatternUtils.setDeviceOwnerInfo(null);
		@@ -13825,6 +13829,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		mUserManager.setUserRestriction(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, true,
		parentUser);
		mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_USER, true,
		parentUser);
		});

		// markProfileOwnerOfOrganizationOwnedDevice will trigger writing of the profile owner

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+35 −1

Original line number	Diff line number	Diff line
		@@ -1998,7 +1998,6 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		private static final Set<String> PROFILE_OWNER_ORGANIZATION_OWNED_GLOBAL_RESTRICTIONS =
		Sets.newSet(
		UserManager.DISALLOW_CONFIG_DATE_TIME,
		UserManager.DISALLOW_ADD_USER,
		UserManager.DISALLOW_BLUETOOTH_SHARING,
		UserManager.DISALLOW_CONFIG_CELL_BROADCASTS,
		UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
		@@ -4005,6 +4004,12 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		// Any caller should be able to call this method.
		assertFalse(dpm.isOrganizationOwnedDeviceWithManagedProfile());
		configureProfileOwnerOfOrgOwnedDevice(admin1, CALLER_USER_HANDLE);

		verify(getServices().userManager).setUserRestriction(
		eq(UserManager.DISALLOW_ADD_USER),
		eq(true),
		eq(UserHandle.of(UserHandle.USER_SYSTEM)));

		assertTrue(dpm.isOrganizationOwnedDeviceWithManagedProfile());

		// A random caller from another user should also be able to get the right result.
		@@ -4012,6 +4017,35 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		assertTrue(dpm.isOrganizationOwnedDeviceWithManagedProfile());
		}

		public void testMarkOrganizationOwnedDevice_baseRestrictionsAdded() throws Exception {
		addManagedProfile(admin1, DpmMockContext.CALLER_UID, admin1);

		configureProfileOwnerOfOrgOwnedDevice(admin1, CALLER_USER_HANDLE);

		// Base restriction DISALLOW_REMOVE_MANAGED_PROFILE added
		verify(getServices().userManager).setUserRestriction(
		eq(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE),
		eq(true),
		eq(UserHandle.of(UserHandle.USER_SYSTEM)));

		// Base restriction DISALLOW_ADD_USER added
		verify(getServices().userManager).setUserRestriction(
		eq(UserManager.DISALLOW_ADD_USER),
		eq(true),
		eq(UserHandle.of(UserHandle.USER_SYSTEM)));

		// Assert base restrictions cannot be added or removed by admin
		assertExpectException(SecurityException.class, null, () ->
		parentDpm.addUserRestriction(admin1, UserManager.DISALLOW_REMOVE_MANAGED_PROFILE));
		assertExpectException(SecurityException.class, null, () ->
		parentDpm.clearUserRestriction(admin1,
		UserManager.DISALLOW_REMOVE_MANAGED_PROFILE));
		assertExpectException(SecurityException.class, null, () ->
		parentDpm.addUserRestriction(admin1, UserManager.DISALLOW_ADD_USER));
		assertExpectException(SecurityException.class, null, () ->
		parentDpm.clearUserRestriction(admin1, UserManager.DISALLOW_ADD_USER));
		}

		public void testSetTime() throws Exception {
		mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
		setupDeviceOwner();