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

Commit 551d3001 authored by Sarup Dalwani's avatar Sarup Dalwani Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21787950



Change-Id: I20a0827bc33226e35d2ef51a9a52352bc38548fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4b30ece e37f6a6f

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.",