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

Commit 9639473e 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: I86b4f1e7f3901a67b0c95d6352687c1c04f81808
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d87f78b5 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.",