From b0c83ec062016ae1b0abc05dc96576701cc6bfd3 Mon Sep 17 00:00:00 2001 From: Shreyas Basarge Date: Thu, 21 Apr 2016 00:44:58 +0100 Subject: [PATCH] Fix logspam by JobInfo Print interval clamp message only for periodic jobs having period/flex less than the minimum value. Bug: 28296128 Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93 --- core/java/android/app/job/JobInfo.java | 32 ++++++++++++++++++-------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/core/java/android/app/job/JobInfo.java b/core/java/android/app/job/JobInfo.java index 09050b644d232..f8358eb28d799 100644 --- a/core/java/android/app/job/JobInfo.java +++ b/core/java/android/app/job/JobInfo.java @@ -24,7 +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 static android.util.TimeUtils.formatDuration; import java.util.ArrayList; @@ -713,15 +713,27 @@ public class JobInfo implements Parcelable { " setRequiresDeviceIdle is an error."); } JobInfo job = new JobInfo(this); - if (job.intervalMillis != 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 interval for " + mJobService.getPackageName() + " is " - + formatForLogging(mFlexMillis) + ". Clamped to " + - formatForLogging(job.getFlexMillis())); + if (job.isPeriodic()) { + if (job.intervalMillis != job.getIntervalMillis()) { + StringBuilder builder = new StringBuilder(); + builder.append("Specified interval for ") + .append(String.valueOf(mJobId)) + .append(" is "); + formatDuration(mIntervalMillis, builder); + builder.append(". Clamped to "); + formatDuration(job.getIntervalMillis(), builder); + Log.w(TAG, builder.toString()); + } + if (job.flexMillis != job.getFlexMillis()) { + StringBuilder builder = new StringBuilder(); + builder.append("Specified flex for ") + .append(String.valueOf(mJobId)) + .append(" is "); + formatDuration(mFlexMillis, builder); + builder.append(". Clamped to "); + formatDuration(job.getFlexMillis(), builder); + Log.w(TAG, builder.toString()); + } } return job; }