Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include parent user id on dumpsys user and cmd users list.

Browse Source 
Test: adb shell cmd user list --all -v | grep parentId
Test: adb shell dumpsys user | grep parentId

Bug: 170332519

Change-Id: I2e5af29acf25e11ca93b363e7cde97b7ad464ff0
This commit is contained in:
Felipe Leme
2020-10-09 11:39:14 -07:00
parent 8633ffd2c5
commit b0e8aba6c8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -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(" <removing> ");
}