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

Commit c59b7d21 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Added --very-verbose (or -V) option to cmd user list" into main

parents 805754ff 06bb36f2

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

+12 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class UserManagerServiceShellCommand extends ShellCommand { 
        pw.println("  help");

        pw.println("    Prints this help text.");

        pw.println();

        pw.println("  list [-v | --verbose] [--all]");

        pw.println("  list [-v | --verbose] [-V | --very-verbose] [--all]");

        pw.println("    Prints all users on the system.");

        pw.println();

        pw.println("  report-system-user-package-whitelist-problems [-v | --verbose] "
@@ -167,6 +167,7 @@ public class UserManagerServiceShellCommand extends ShellCommand { 
        final PrintWriter pw = getOutPrintWriter();

        boolean all = false;

        boolean verbose = false;

        boolean veryVerbose = false;

        String opt;

        while ((opt = getNextOption()) != null) {

            switch (opt) {
@@ -174,6 +175,11 @@ public class UserManagerServiceShellCommand extends ShellCommand { 
                case "--verbose":

                    verbose = true;

                    break;

                case "-V":

                case "--very-verbose":

                    verbose = true;

                    veryVerbose = true;

                    break;

                case "--all":

                    all = true;

                    break;
@@ -227,10 +233,13 @@ public class UserManagerServiceShellCommand extends ShellCommand { 
                    final boolean hasParent = user.profileGroupId != user.id

                            && user.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID;

                    final boolean visible = mService.isUserVisible(user.id);

                    final String unresolvedName = user.name;

                    // If name is null, use the default (owner / guest)

                    final String name = user.name != null ? user.name : mService.getName(user);

                    pw.printf("%d: id=%d, name=%s, unresolvedName=%s, type=%s, "

                    String unresolvedName = "";

                    if (veryVerbose) {

                        unresolvedName = ", unresolvedName=" + user.name;

                    }

                    pw.printf("%d: id=%d, name=%s%s, type=%s, "

                            + "flags=%s%s%s%s%s%s%s%s%s%s\n",

                            i,

                            user.id,