Merge "Add user type to 'user list -v' output"

2021-08-04 17:37:45 +00:00
parent e43df490d9 607dc521fa
commit 89d539ac48
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -5087,8 +5087,11 @@ public class UserManagerService extends IUserManager.Stub {
                            Binder.restoreCallingIdentity(ident);
                        }
                    }
-                    pw.printf("%d: id=%d, name=%s, flags=%s%s%s%s%s%s%s%s%s\n", i, user.id,
+                    pw.printf("%d: id=%d, name=%s, type=%s, flags=%s%s%s%s%s%s%s%s%s\n",
+                            i,
+                            user.id,
                            user.name,
+                            user.userType.replace("android.os.usertype.", ""),
                            UserInfo.flagsToString(user.flags),
                            hasParent ? " (parentId=" + user.profileGroupId + ")" : "",
                            running ? " (running)" : "",