Merge "Reverted some UserManagerService.Shell refactorings..." into tm-dev (d7b7a5a2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserManagerService.java

+26 −46

Original line number	Diff line number	Diff line
		@@ -5415,46 +5415,24 @@ public class UserManagerService extends IUserManager.Stub {

		private final class Shell extends ShellCommand {

		private static final String PREFIX_HELP_COMMAND = " ";
		private static final String PREFIX_HELP_DESCRIPTION = " ";
		private static final String PREFIX_HELP_DESCRIPTION_EXTRA_LINES = " ";

		private static final String CMD_HELP = "help";
		private static final String CMD_LIST = "list";
		private static final String CMD_REPORT_SYSTEM_USER_PACKAGE_ALLOWLIST_PROBLEMS =
		"report-system-user-package-whitelist-problems";

		private static final String ARG_V = "-v";
		private static final String ARG_VERBOSE = "--verbose";
		private static final String ARG_ALL = "--all";
		private static final String ARG_CRITICAL_ONLY = "--critical-only";
		private static final String ARG_MODE = "--mode";

		@Override
		public void onHelp() {
		final PrintWriter pw = getOutPrintWriter();
		pw.printf("User manager (user) commands:\n");

		pw.printf("%s%s\n", PREFIX_HELP_COMMAND, CMD_HELP);
		pw.printf("%sPrints this help text.\n\n", PREFIX_HELP_DESCRIPTION);

		pw.printf("%s%s [%s] [%s]\n", PREFIX_HELP_COMMAND, CMD_LIST, ARG_V, ARG_ALL);
		pw.printf("%sPrints all users on the system.\n\n", PREFIX_HELP_DESCRIPTION);

		pw.printf("%s%s [%s \| %s] [%s] [%s MODE]\n", PREFIX_HELP_COMMAND,
		CMD_REPORT_SYSTEM_USER_PACKAGE_ALLOWLIST_PROBLEMS,
		ARG_V, ARG_VERBOSE, ARG_CRITICAL_ONLY, ARG_MODE);

		pw.printf("%sReports all issues on user-type package allowlist XML files. Options:\n",
		PREFIX_HELP_DESCRIPTION);
		pw.printf("%s%s \| %s: shows extra info, like number of issues\n",
		PREFIX_HELP_DESCRIPTION, ARG_V, ARG_VERBOSE);
		pw.printf("%s%s: show only critical issues, excluding warnings\n",
		PREFIX_HELP_DESCRIPTION, ARG_CRITICAL_ONLY);
		pw.printf("%s%s MODE: shows what errors would be if device used mode MODE\n"
		+ "%s(where MODE is the allowlist mode integer as defined by "
		+ "config_userTypePackageWhitelistMode)\n\n",
		PREFIX_HELP_DESCRIPTION, ARG_MODE, PREFIX_HELP_DESCRIPTION_EXTRA_LINES);
		pw.println("User manager (user) commands:");
		pw.println(" help");
		pw.println(" Prints this help text.");
		pw.println();
		pw.println(" list [-v \| --verbose] [--all]");
		pw.println(" Prints all users on the system.");
		pw.println();
		pw.println(" report-system-user-package-whitelist-problems [-v \| --verbose] "
		+ "[--critical-only] [--mode MODE]");
		pw.println(" Reports all issues on user-type package allowlist XML files. Options:");
		pw.println(" -v \| --verbose: shows extra info, like number of issues");
		pw.println(" --critical-only: show only critical issues, excluding warnings");
		pw.println(" --mode MODE: shows what errors would be if device used mode MODE");
		pw.println(" (where MODE is the allowlist mode integer as defined by "
		+ "config_userTypePackageWhitelistMode)");
		}

		@Override
		@@ -5465,9 +5443,9 @@ public class UserManagerService extends IUserManager.Stub {

		try {
		switch(cmd) {
		case CMD_LIST:
		case "list":
		return runList();
		case CMD_REPORT_SYSTEM_USER_PACKAGE_ALLOWLIST_PROBLEMS:
		case "report-system-user-package-whitelist-problems":
		return runReportPackageAllowlistProblems();
		default:
		return handleDefaultCommands(cmd);
		@@ -5485,10 +5463,11 @@ public class UserManagerService extends IUserManager.Stub {
		String opt;
		while ((opt = getNextOption()) != null) {
		switch (opt) {
		case ARG_V:
		case "-v":
		case "--verbose":
		verbose = true;
		break;
		case ARG_ALL:
		case "--all":
		all = true;
		break;
		default:
		@@ -5570,14 +5549,14 @@ public class UserManagerService extends IUserManager.Stub {
		String opt;
		while ((opt = getNextOption()) != null) {
		switch (opt) {
		case ARG_V:
		case ARG_VERBOSE:
		case "-v":
		case "--verbose":
		verbose = true;
		break;
		case ARG_CRITICAL_ONLY:
		case "--critical-only":
		criticalOnly = true;
		break;
		case ARG_MODE:
		case "--mode":
		mode = Integer.parseInt(getNextArgRequired());
		break;
		default:
		@@ -5596,7 +5575,8 @@ public class UserManagerService extends IUserManager.Stub {
		}
		return 0;
		}
		}

		} // class Shell

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {