From ed82890fa781b46517bc2eca8179b56dfc58c2cb Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Tue, 4 May 2021 17:32:08 -0700
Subject: [PATCH] Fix QuotaController dump.

1. Remove extra space before "EJ" in the timer dump.
2. Actually print out the list of system installers. SparseSetArray
   doesn't have toString() implemented.

Bug: 141645789
Bug: 141495777
Test: adb shell dumpsys jobscheduler
Change-Id: Ia6e88b0b1177dc585fcca4a29d658b5a9370b60b
---
 .../server/job/controllers/QuotaController.java     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java
index aace6457fc9d4..3322841dacb00 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java
@@ -2198,7 +2198,7 @@ public final class QuotaController extends StateController {
 
         public void dump(IndentingPrintWriter pw, Predicate<JobStatus> predicate) {
             pw.print("Timer<");
-            pw.print(mRegularJobTimer ? "REG" : " EJ");
+            pw.print(mRegularJobTimer ? "REG" : "EJ");
             pw.print(">{");
             pw.print(mPkg);
             pw.print("} ");
@@ -4075,7 +4075,16 @@ public final class QuotaController extends StateController {
 
         pw.println("Special apps:");
         pw.increaseIndent();
-        pw.print("System installers", mSystemInstallers.toString());
+        pw.print("System installers={");
+        for (int si = 0; si < mSystemInstallers.size(); ++si) {
+            if (si > 0) {
+                pw.print(", ");
+            }
+            pw.print(mSystemInstallers.keyAt(si));
+            pw.print("->");
+            pw.print(mSystemInstallers.get(si));
+        }
+        pw.println("}");
         pw.decreaseIndent();
 
         pw.println();