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

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

Merge "Added guestToRemove to dumpsys user and cmd user list -v" into main

parents 97402ef1 99315b79

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

+3 −0
Original line number Diff line number Diff line
@@ -8010,6 +8010,9 @@ public class UserManagerService extends IUserManager.Stub { 
        if (userInfo.convertedFromPreCreated) {

            pw.print(" <converted>");

        }

        if (userInfo.guestToRemove) {

            pw.print(" <guestToRemove>");

        }

        pw.println();

        pw.print("    Type: "); pw.println(userInfo.userType);

        pw.print("    Flags: "); pw.print(userInfo.flags); pw.print(" (");

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

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public class UserManagerServiceShellCommand extends ShellCommand { 
                        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",

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

                            i,

                            user.id,

                            name,
@@ -250,6 +250,7 @@ public class UserManagerServiceShellCommand extends ShellCommand { 
                            hasParent ? " (parentId=" + user.profileGroupId + ")" : "",

                            running ? " (running)" : "",

                            user.partial ? " (partial)" : "",

                            user.guestToRemove ? " (guestToRemove)" : "",

                            user.preCreated ? " (pre-created)" : "",

                            user.convertedFromPreCreated ? " (converted)" : "",

                            deviceOwner, profileOwner,