Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Bypassing available user check for profiles."" into udc-dev

Browse Source
This commit is contained in:
Sarup Dalwani
2023-03-16 23:09:40 +00:00
committed by Android (Google) Code Review
parent b7c94668f4 3168c245dc
commit e37f6a6f73
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -4737,9 +4737,9 @@ public class UserManagerService extends IUserManager.Stub {
UserManager.USER_OPERATION_ERROR_MAX_USERS);
}
// Keep logic in sync with getRemainingCreatableUserCount()
if (!isGuest && !isProfile && !isDemo && isUserLimitReached()) {
if (!isGuest && !isManagedProfile && !isDemo && isUserLimitReached()) {
// If the user limit has been reached, we cannot add a user (except guest/demo).
// Note that profiles can bypass it in certain circumstances (taken
// Note that managed profiles can bypass it in certain circumstances (taken
// into account in the profile check below).
throwCheckedUserOperationException(
"Cannot add user. Maximum user limit is reached.",