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

Commit 99315b79 authored by Felipe Leme's avatar Felipe Leme
Browse files

Added guestToRemove to dumpsys user and cmd user list -v 

Test: adb shell pm create-user --guest ElGuesto ; adb shell pm mark-guest-for-deletion 10; adb shell cmd user list -v --all ; adb shell dumpsys user | grep guestToRemove
Bug: 408021585
Flag: EXEMPT added debugging feature

Change-Id: If5fe045fb98376c623f5bb9042d6fcf77b045369
parent 5bcd67ee

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

+3 −0
Original line number Diff line number Diff line
@@ -7998,6 +7998,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,