diff options
3 files changed, 24 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index db12c37f2c2d..ccb54f93ba33 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -334,4 +334,9 @@ public abstract class ActivityManagerInternal { * Sets the user switcher message for switching to {@link android.os.UserHandle#SYSTEM}. */ public abstract void setSwitchingToSystemUserMessage(String switchingToSystemUserMessage); + + /** + * Returns maximum number of users that can run simultaneously. + */ + public abstract int getMaxRunningUsers(); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 48c678ebd0e8..6e33afa14d0c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -25142,6 +25142,11 @@ public class ActivityManagerService extends IActivityManager.Stub public void setSwitchingToSystemUserMessage(String switchingToSystemUserMessage) { mUserController.setSwitchingToSystemUserMessage(switchingToSystemUserMessage); } + + @Override + public int getMaxRunningUsers() { + return mUserController.mMaxRunningUsers; + } } /** diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index bd1cd3308ea7..11b804111e61 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -18,6 +18,7 @@ package com.android.server.pm; import android.accounts.IAccountManager; import android.app.ActivityManager; +import android.app.ActivityManagerInternal; import android.content.ComponentName; import android.content.Context; import android.content.IIntentReceiver; @@ -72,6 +73,7 @@ import android.util.PrintWriterPrinter; import com.android.internal.content.PackageHelper; import com.android.internal.util.ArrayUtils; import com.android.internal.util.SizedInputStream; +import com.android.server.LocalServices; import com.android.server.SystemConfig; import dalvik.system.DexFile; @@ -222,6 +224,8 @@ class PackageManagerShellCommand extends ShellCommand { return runSetUserRestriction(); case "get-max-users": return runGetMaxUsers(); + case "get-max-running-users": + return runGetMaxRunningUsers(); case "set-home-activity": return runSetHomeActivity(); case "set-installer": @@ -1883,6 +1887,14 @@ class PackageManagerShellCommand extends ShellCommand { return 0; } + public int runGetMaxRunningUsers() { + ActivityManagerInternal activityManagerInternal = + LocalServices.getService(ActivityManagerInternal.class); + getOutPrintWriter().println("Maximum supported running users: " + + activityManagerInternal.getMaxRunningUsers()); + return 0; + } + private static class InstallParams { SessionParams sessionParams; String installerPackageName; @@ -2607,6 +2619,8 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(""); pw.println(" get-max-users"); pw.println(""); + pw.println(" get-max-running-users"); + pw.println(""); pw.println(" compile [-m MODE | -r REASON] [-f] [-c] [--split SPLIT_NAME]"); pw.println(" [--reset] [--check-prof (true | false)] (-a | TARGET-PACKAGE)"); pw.println(" Trigger compilation of TARGET-PACKAGE or all packages if \"-a\". Options are:"); |