Merge "Improve dumpsys user readability"

2 files changed, 9 insertions, 7 deletions

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index a44d1797b82b..b0d3d53d58b2 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -4699,6 +4699,7 @@ public class UserManagerService extends IUserManager.Stub {
             pw.println("N/A");
         }
 
+        pw.println();
         StringBuilder sb = new StringBuilder();
         synchronized (mPackagesLock) {
             synchronized (mUsersLock) {
@@ -4786,6 +4787,7 @@ public class UserManagerService extends IUserManager.Stub {
                 }
             }
             pw.println();
+            pw.println("Device properties:");
             pw.println("  Device owner id:" + mDeviceOwnerUserId);
             pw.println();
             pw.println("  Guest restrictions:");
@@ -4819,10 +4821,10 @@ public class UserManagerService extends IUserManager.Stub {
 
         // Dump UserTypes
         pw.println();
-        pw.println("  User types (" + mUserTypes.size() + " types):");
+        pw.println("User types (" + mUserTypes.size() + " types):");
         for (int i = 0; i < mUserTypes.size(); i++) {
             pw.println("    " + mUserTypes.keyAt(i) + ": ");
-            mUserTypes.valueAt(i).dump(pw);
+            mUserTypes.valueAt(i).dump(pw, "        ");
         }
 
         // Dump package whitelist
diff --git a/services/core/java/com/android/server/pm/UserTypeDetails.java b/services/core/java/com/android/server/pm/UserTypeDetails.java
index be6880e76904..d840e5d8b882 100644
--- a/services/core/java/com/android/server/pm/UserTypeDetails.java
+++ b/services/core/java/com/android/server/pm/UserTypeDetails.java
@@ -271,8 +271,7 @@ public final class UserTypeDetails {
     }
 
     /** Dumps details of the UserTypeDetails. Do not parse this. */
-    public void dump(PrintWriter pw) {
-        final String prefix = "        ";
+    public void dump(PrintWriter pw, String prefix) {
         pw.print(prefix); pw.print("mName: "); pw.println(mName);
         pw.print(prefix); pw.print("mBaseType: "); pw.println(UserInfo.flagsToString(mBaseType));
         pw.print(prefix); pw.print("mEnabled: "); pw.println(mEnabled);
@@ -282,6 +281,7 @@ public final class UserTypeDetails {
         pw.println(UserInfo.flagsToString(mDefaultUserInfoPropertyFlags));
         pw.print(prefix); pw.print("mLabel: "); pw.println(mLabel);
 
+        final String restrictionsPrefix = prefix + "    ";
         if (isSystem()) {
             pw.print(prefix); pw.println("config_defaultFirstUserRestrictions: ");
             try {
@@ -293,13 +293,13 @@ public final class UserTypeDetails {
                         restrictions.putBoolean(userRestriction, true);
                     }
                 }
-                UserRestrictionsUtils.dumpRestrictions(pw, prefix + "    ", restrictions);
+                UserRestrictionsUtils.dumpRestrictions(pw, restrictionsPrefix, restrictions);
             } catch (Resources.NotFoundException e) {
-                pw.print(prefix); pw.println("    none - resource not found");
+                pw.print(restrictionsPrefix); pw.println("none - resource not found");
             }
         } else {
             pw.print(prefix); pw.println("mDefaultRestrictions: ");
-            UserRestrictionsUtils.dumpRestrictions(pw, prefix + "    ", mDefaultRestrictions);
+            UserRestrictionsUtils.dumpRestrictions(pw, restrictionsPrefix, mDefaultRestrictions);
         }
 
         pw.print(prefix); pw.print("mIconBadge: "); pw.println(mIconBadge);