A little cleanup of activity manager dumpsys output.

Test: manually ran dumpsys

Change-Id: I0c3a523c501576beba2bf85c61faa026eb2a0440

3 files changed, 23 insertions, 11 deletions

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 5956923081c2..18a00858bb5a 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15293,9 +15293,11 @@ public class ActivityManagerService extends IActivityManager.Stub
                 printedAnything = needSep = true;
             }
         }
-        if (mValidateUids.size() > 0) {
-            if (dumpUids(pw, dumpPackage, mValidateUids, "UID validation:", needSep)) {
-                printedAnything = needSep = true;
+        if (dumpAll) {
+            if (mValidateUids.size() > 0) {
+                if (dumpUids(pw, dumpPackage, mValidateUids, "UID validation:", needSep)) {
+                    printedAnything = needSep = true;
+                }
             }
         }
 
diff --git a/services/core/java/com/android/server/am/UidRecord.java b/services/core/java/com/android/server/am/UidRecord.java
index 48a1a1a38188..f953a36771f6 100644
--- a/services/core/java/com/android/server/am/UidRecord.java
+++ b/services/core/java/com/android/server/am/UidRecord.java
@@ -128,13 +128,13 @@ public final class UidRecord {
         }
         sb.append(" procs:");
         sb.append(numProcs);
-        sb.append(" curProcStateSeq:");
+        sb.append(" seq(");
         sb.append(curProcStateSeq);
-        sb.append(" lastNetworkUpdatedProcStateSeq:");
+        sb.append(",");
         sb.append(lastNetworkUpdatedProcStateSeq);
-        sb.append(" lastDispatchedProcStateSeq:");
+        sb.append(",");
         sb.append(lastDispatchedProcStateSeq);
-        sb.append("}");
+        sb.append(")}");
         return sb.toString();
     }
 }
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 6e09ee269791..46d7bfc06d84 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -1965,12 +1965,22 @@ public final class JobSchedulerService extends com.android.server.SystemService
                     pw.print(mHandler.isReadyToBeExecutedLocked(job));
                     pw.print(" (job=");
                     pw.print(job.isReady());
-                    pw.print(" pending=");
-                    pw.print(mPendingJobs.contains(job));
-                    pw.print(" active=");
-                    pw.print(isCurrentlyActiveLocked(job));
                     pw.print(" user=");
                     pw.print(ArrayUtils.contains(mStartedUsers, job.getUserId()));
+                    pw.print(" !pending=");
+                    pw.print(!mPendingJobs.contains(job));
+                    pw.print(" !active=");
+                    pw.print(!isCurrentlyActiveLocked(job));
+                    pw.print(" comp=");
+                    boolean componentPresent = false;
+                    try {
+                        componentPresent = (AppGlobals.getPackageManager().getServiceInfo(
+                                job.getServiceComponent(),
+                                PackageManager.MATCH_DEBUG_TRIAGED_MISSING,
+                                job.getUserId()) != null);
+                    } catch (RemoteException e) {
+                    }
+                    pw.print(componentPresent);
                     pw.println(")");
                 }
             } else {