From b0e8aba6c85a1d7dcc206832beaac3cd8de9a9fe Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 9 Oct 2020 11:39:14 -0700 Subject: [PATCH] Include parent user id on dumpsys user and cmd users list. Test: adb shell cmd user list --all -v | grep parentId Test: adb shell dumpsys user | grep parentId Bug: 170332519 Change-Id: I2e5af29acf25e11ca93b363e7cde97b7ad464ff0 --- .../java/com/android/server/pm/UserManagerService.java | 10 +++++++++- 1 file changed, 9 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 0a8c8f6cbebce..755b161f081b2 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -4708,9 +4708,12 @@ public class UserManagerService extends IUserManager.Stub { final UserInfo user = users.get(i); final boolean running = am.isUserRunning(user.id, 0); final boolean current = user.id == currentUser; + final boolean hasParent = user.profileGroupId != user.id + && user.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID; if (verbose) { - pw.printf("%d: id=%d, name=%s, flags=%s%s%s%s%s%s\n", i, user.id, user.name, + pw.printf("%d: id=%d, name=%s, flags=%s%s%s%s%s%s%s\n", i, user.id, user.name, UserInfo.flagsToString(user.flags), + hasParent ? " (parentId=" + user.profileGroupId + ")" : "", running ? " (running)" : "", user.partial ? " (partial)" : "", user.preCreated ? " (pre-created)" : "", @@ -4791,6 +4794,11 @@ public class UserManagerService extends IUserManager.Stub { pw.print(" "); pw.print(userInfo); pw.print(" serialNo="); pw.print(userInfo.serialNumber); pw.print(" isPrimary="); pw.print(userInfo.isPrimary()); + if (userInfo.profileGroupId != userInfo.id + && userInfo.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID) { + pw.print(" parentId="); pw.print(userInfo.profileGroupId); + } + if (mRemovingUserIds.get(userId)) { pw.print(" "); }