From d8bf6b9feded2ad0fc1040254ccc9040dceb01a4 Mon Sep 17 00:00:00 2001
From: Shreyas Basarge <snb@google.com>
Date: Tue, 2 Feb 2016 23:45:14 +0000
Subject: [PATCH] Add more logging to JobScheduler

Improves logging in perioidc job period clamping.
Added sourcePackage to dumpsys in JobScheduler.

Bug: 26874152
Change-Id: Iaccd6df3e70dfcae16e983893a708342fda637b3
---
 core/java/android/app/job/JobInfo.java                | 11 +++++++----
 .../com/android/server/job/controllers/JobStatus.java |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/java/android/app/job/JobInfo.java b/core/java/android/app/job/JobInfo.java
index b2ca023a017f8..5398e7f2dc951 100644
--- a/core/java/android/app/job/JobInfo.java
+++ b/core/java/android/app/job/JobInfo.java
@@ -24,6 +24,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.PersistableBundle;
 import android.util.Log;
+import static android.util.TimeUtils.formatForLogging;
 
 import java.util.ArrayList;
 
@@ -640,12 +641,14 @@ public class JobInfo implements Parcelable {
             }
             JobInfo job = new JobInfo(this);
             if (job.intervalMillis != job.getIntervalMillis()) {
-                Log.w(TAG, "Specified interval is less than minimum interval. Clamped to "
-                        + job.getIntervalMillis());
+                Log.w(TAG, "Specified interval for " + mJobService.getPackageName() + " is "
+                        + formatForLogging(mIntervalMillis) + ". Clamped to " +
+                        formatForLogging(job.getIntervalMillis()));
             }
             if (job.flexMillis != job.getFlexMillis()) {
-                Log.w(TAG, "Specified flex is less than minimum flex. Clamped to "
-                        + job.getFlexMillis());
+                Log.w(TAG, "Specified interval for " + mJobService.getPackageName() + " is "
+                        + formatForLogging(mFlexMillis) + ". Clamped to " +
+                        formatForLogging(job.getFlexMillis()));
             }
             return job;
         }
diff --git a/services/core/java/com/android/server/job/controllers/JobStatus.java b/services/core/java/com/android/server/job/controllers/JobStatus.java
index be55799dd763a..e749433b1e3fa 100644
--- a/services/core/java/com/android/server/job/controllers/JobStatus.java
+++ b/services/core/java/com/android/server/job/controllers/JobStatus.java
@@ -349,9 +349,9 @@ public class JobStatus {
         pw.print(prefix); UserHandle.formatUid(pw, uId);
         pw.print(" tag="); pw.println(tag);
         pw.print(prefix);
-        pw.print("Source: uid="); UserHandle.formatUid(pw, sourceUid);
-        pw.print(" user="); pw.print(sourceUserId);
-        pw.print(" pkg="); pw.println(sourcePackageName);
+        pw.print("Source: uid="); UserHandle.formatUid(pw, getSourceUid());
+        pw.print(" user="); pw.print(getSourceUserId());
+        pw.print(" pkg="); pw.println(getSourcePackageName());
         pw.print(prefix); pw.println("JobInfo:");
         pw.print(prefix); pw.print("  Service: ");
         pw.println(job.getService().flattenToShortString());