From 3168c245dce0d398f41965b668d07a675fa9e8a3 Mon Sep 17 00:00:00 2001 From: Sarup Dalwani Date: Mon, 6 Mar 2023 17:54:31 +0000 Subject: [PATCH] Revert "Bypassing available user check for profiles." Revert Change-Id: I22b0344b376f5d729ba5b70fd9d0315ff34d19e8 Bug: 271588557 Test: atest CtsAppCloningHostTest Test: atest CtsAppCloningDeviceTestCases Change-Id: I6de154274bcb8567d22773259075930a08ffe1f2 --- .../core/java/com/android/server/pm/UserManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index dd014ee637c78..32e4dad59d0dc 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -4645,9 +4645,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.",