From 607dc521fab919b51efaa54815d7d33cc9895c93 Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Tue, 3 Aug 2021 11:25:45 -0700 Subject: [PATCH] Add user type to 'user list -v' output Shows the user type in the verbose user list. For convenient readability, the phrase 'android.os.usertype.' is stripped from the output. So, e.g., type=android.os.usertype.full.GUEST will appear as type=full.GUEST Test: adb shell cmd user list -v Change-Id: I87b03b74c8ca2d83a609822597b3c80a178827be --- .../core/java/com/android/server/pm/UserManagerService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 89f2bfe4c64d7..7d1049493c080 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -5071,8 +5071,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)" : "",