From ef8e95eabd4ece39937c72c60e5ae56638b7b837 Mon Sep 17 00:00:00 2001
From: Evan Severson <evanseverson@google.com>
Date: Thu, 25 Jun 2020 10:58:22 -0700
Subject: [PATCH] Fix indentation in dumpsys package

This change makes it so that runtime permissions don't look like a
property of overlay paths and overlay paths are per user.

Example output truncating at 72 chrars:
before
```
    requested permissions:
      android.permission.READ_SMS: restricted=true
      android.permission.READ_CALENDAR
      android.permission.READ_CALL_LOG: restricted=true
    install permissions:
      android.permission.FOREGROUND_SERVICE: granted=true
    User 0: ceDataInode=41785 installed=true hidden=false suspended=fals
    overlay paths:
      /product/overlay/NavigationBarMode2Button/NavigationBarMode2Button
      runtime permissions:
        android.permission.READ_SMS: granted=false, flags=[ USER_SENSITI
        android.permission.READ_CALENDAR: granted=false, flags=[ USER_SE
        android.permission.READ_CALL_LOG: granted=false, flags=[ USER_SE
```

after
```
    requested permissions:
      android.permission.READ_SMS: restricted=true
      android.permission.READ_CALENDAR
      android.permission.READ_CALL_LOG: restricted=true
    install permissions:
      android.permission.FOREGROUND_SERVICE: granted=true
    User 0: ceDataInode=41785 installed=true hidden=false suspended=fals
      overlay paths:
        /product/overlay/NavigationBarMode2Button/NavigationBarMode2Butt
      runtime permissions:
        android.permission.READ_SMS: granted=false, flags=[ USER_SENSITI
        android.permission.READ_CALENDAR: granted=false, flags=[ USER_SE
        android.permission.READ_CALL_LOG: granted=false, flags=[ USER_SE
```

Test: adb shell dumpsys package
Change-Id: Ia26f76c867c163ae84c1df1d1fc53da6957a23cd
---
 services/core/java/com/android/server/pm/Settings.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index ad61d242ed348..0472b821d3cc1 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -4935,9 +4935,9 @@ public final class Settings {
 
             String[] overlayPaths = ps.getOverlayPaths(user.id);
             if (overlayPaths != null && overlayPaths.length > 0) {
-                pw.print(prefix); pw.println("  overlay paths:");
+                pw.print(prefix); pw.println("    overlay paths:");
                 for (String path : overlayPaths) {
-                    pw.print(prefix); pw.print("    "); pw.println(path);
+                    pw.print(prefix); pw.print("      "); pw.println(path);
                 }
             }
 
@@ -4949,10 +4949,10 @@ public final class Settings {
                     if (libOverlayPaths.getValue() == null) {
                         continue;
                     }
-                    pw.print(prefix); pw.print("  ");
+                    pw.print(prefix); pw.print("    ");
                     pw.print(libOverlayPaths.getKey()); pw.println(" overlay paths:");
                     for (String path : libOverlayPaths.getValue()) {
-                        pw.print(prefix); pw.print("    "); pw.println(path);
+                        pw.print(prefix); pw.print("      "); pw.println(path);
                     }
                 }
             }