Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e37f6a6f authored by Sarup Dalwani's avatar Sarup Dalwani Committed by Android (Google) Code Review
Browse files

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

parents b7c94668 3168c245

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

+2 −2
Original line number Diff line number Diff line
@@ -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.",