commit f973a7b17135535528ae6e792d38d4bf081b44c4
author Christopher Tate <ctate@google.com> Fri Aug 29 12:54:08 2014 -0700
committer Christopher Tate <ctate@google.com> Fri Aug 29 14:24:15 2014 -0700
tree a6ed1f5500b142be6958e34ea496444b13dc8bff
parent 162fa7f41b1aa5b3c91b168bc27d1886dec166b1

Expand job scheduler dumpsys a bit

Now it actually says what jobs are active.

Bug 17322886

Change-Id: I1a0fe0bf8d4cb2988cc89a11793981037157ee07

services/core/java/com/android/server/job/JobSchedulerService.java

diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 379ec94..c3bc306 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -819,6 +819,7 @@
     };
 
     void dumpInternal(PrintWriter pw) {
+        final long now = SystemClock.elapsedRealtime();
         synchronized (mJobs) {
             pw.print("Started users: ");
             for (int i=0; i<mStartedUsers.size(); i++) {
@@ -833,15 +834,14 @@
                     job.dump(pw, "  ");
                 }
             } else {
-                pw.println();
-                pw.println("No jobs scheduled.");
+                pw.println("  None.");
             }
             for (int i=0; i<mControllers.size(); i++) {
                 pw.println();
                 mControllers.get(i).dumpControllerState(pw);
             }
             pw.println();
-            pw.println("Pending");
+            pw.println("Pending:");
             for (int i=0; i<mPendingJobs.size(); i++) {
                 pw.println(mPendingJobs.get(i).hashCode());
             }
@@ -852,10 +852,14 @@
                 if (jsc.isAvailable()) {
                     continue;
                 } else {
-                    pw.println(jsc.getRunningJob().hashCode() + " for: " +
-                            (SystemClock.elapsedRealtime()
-                                    - jsc.getExecutionStartTimeElapsed())/1000 + "s " +
-                            "timeout: " + jsc.getTimeoutElapsed());
+                    final long timeout = jsc.getTimeoutElapsed();
+                    pw.print("Running for: ");
+                    pw.print((now - jsc.getExecutionStartTimeElapsed())/1000);
+                    pw.print("s timeout=");
+                    pw.print(timeout);
+                    pw.print(" fromnow=");
+                    pw.println(timeout-now);
+                    jsc.getRunningJob().dump(pw, "  ");
                 }
             }
             pw.println();