diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 93837b34f7b3..092ec8ef4a8a 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -7490,6 +7490,7 @@ public class UserManagerService extends IUserManager.Stub { final long now = System.currentTimeMillis(); final long nowRealtime = SystemClock.elapsedRealtime(); final StringBuilder sb = new StringBuilder(); + final Resources resources = Resources.getSystem(); if (args != null && args.length > 0) { switch (args[0]) { @@ -7570,10 +7571,15 @@ public class UserManagerService extends IUserManager.Stub { // Dump some capabilities pw.println(); - pw.print(" Max users: " + UserManager.getMaxSupportedUsers()); + int effectiveMaxSupportedUsers = UserManager.getMaxSupportedUsers(); + pw.print(" Max users: " + effectiveMaxSupportedUsers); + int defaultMaxSupportedUsers = resources.getInteger(R.integer.config_multiuserMaximumUsers); + if (effectiveMaxSupportedUsers != defaultMaxSupportedUsers) { + pw.print(" (built-in value: " + defaultMaxSupportedUsers + ")"); + } pw.println(" (limit reached: " + isUserLimitReached() + ")"); pw.println(" Supports switchable users: " + UserManager.supportsMultipleUsers()); - pw.println(" All guests ephemeral: " + Resources.getSystem().getBoolean( + pw.println(" All guests ephemeral: " + resources.getBoolean( com.android.internal.R.bool.config_guestUserEphemeral)); pw.println(" Force ephemeral users: " + mForceEphemeralUsers); final boolean isHeadlessSystemUserMode = isHeadlessSystemUserMode(); @@ -7588,7 +7594,7 @@ public class UserManagerService extends IUserManager.Stub { } } if (isHeadlessSystemUserMode) { - pw.println(" Can switch to headless system user: " + Resources.getSystem() + pw.println(" Can switch to headless system user: " + resources .getBoolean(com.android.internal.R.bool.config_canSwitchToHeadlessSystemUser)); } pw.println(" User version: " + mUserVersion); |