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

Commit f82c20ad authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Improvements on UserManagerService ShellCommand implementation (4/4)." into tm-dev

parents a2d50b2b 21ba3a2c

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

+156 −156
Original line number Diff line number Diff line
@@ -5413,6 +5413,8 @@ public class UserManagerService extends IUserManager.Stub { 
        (new Shell()).exec(this, in, out, err, args, callback, resultReceiver);

    }



    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 = "      ";
@@ -5428,8 +5430,6 @@ public class UserManagerService extends IUserManager.Stub { 
        private static final String ARG_CRITICAL_ONLY = "--critical-only";

        private static final String ARG_MODE = "--mode";



    private final class Shell extends ShellCommand {



        @Override

        public void onHelp() {

            final PrintWriter pw = getOutPrintWriter();
@@ -5498,7 +5498,7 @@ public class UserManagerService extends IUserManager.Stub { 
            }

            final IActivityManager am = ActivityManager.getService();

            final List<UserInfo> users = getUsers(/* excludePartial= */ !all,

                /* excludingDying=*/ false, /* excludePreCreated= */ !all);

                    /* excludeDying= */ false, /* excludePreCreated= */ !all);

            if (users == null) {

                pw.println("Error: couldn't get users");

                return 1;