Merge "Restricted Users for MainUser" into main (289bea1a) · Commits · e / os / android_frameworks_base

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

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3133,6 +3133,13 @@ public class UserManagerService extends IUserManager.Stub {
	@Override		@Override
	public boolean canHaveRestrictedProfile(@UserIdInt int userId) {		public boolean canHaveRestrictedProfile(@UserIdInt int userId) {
	checkManageUsersPermission("canHaveRestrictedProfile");		checkManageUsersPermission("canHaveRestrictedProfile");
			return canHaveRestrictedProfileNoChecks(userId);
			}

			private boolean canHaveRestrictedProfileNoChecks(@UserIdInt int userId) {
			if (isCreationOverrideEnabled()) {
			return true;
			}
	synchronized (mUsersLock) {		synchronized (mUsersLock) {
	final UserInfo userInfo = getUserInfoLU(userId);		final UserInfo userInfo = getUserInfoLU(userId);
	if (userInfo == null \|\| !userInfo.canHaveProfile()) {		if (userInfo == null \|\| !userInfo.canHaveProfile()) {
	@@ -6142,10 +6149,9 @@ public class UserManagerService extends IUserManager.Stub {
	+ " for user " + parentId,		+ " for user " + parentId,
	UserManager.USER_OPERATION_ERROR_MAX_USERS);		UserManager.USER_OPERATION_ERROR_MAX_USERS);
	}		}
	if (isRestricted && (parentId != UserHandle.USER_SYSTEM)		if (isRestricted && !canHaveRestrictedProfileNoChecks(parentId)) {
	&& !isCreationOverrideEnabled()) {
	throwCheckedUserOperationException(		throwCheckedUserOperationException(
	"Cannot add restricted profile - parent user must be system",		"Cannot add restricted profile for user " + parentId,
	USER_OPERATION_ERROR_UNKNOWN);		USER_OPERATION_ERROR_UNKNOWN);
	}		}