Merge "Fix logspam by JobInfo" into nyc-dev

This commit is contained in:
Dianne Hackborn
2016-04-21 00:39:41 +00:00
committed by Android (Google) Code Review

View File

@@ -24,7 +24,7 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.util.Log; import android.util.Log;
import static android.util.TimeUtils.formatForLogging; import static android.util.TimeUtils.formatDuration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -760,15 +760,27 @@ public class JobInfo implements Parcelable {
" setRequiresDeviceIdle is an error."); " setRequiresDeviceIdle is an error.");
} }
JobInfo job = new JobInfo(this); JobInfo job = new JobInfo(this);
if (job.intervalMillis != job.getIntervalMillis()) { if (job.isPeriodic()) {
Log.w(TAG, "Specified interval for " + mJobService.getPackageName() + " is " if (job.intervalMillis != job.getIntervalMillis()) {
+ formatForLogging(mIntervalMillis) + ". Clamped to " + StringBuilder builder = new StringBuilder();
formatForLogging(job.getIntervalMillis())); builder.append("Specified interval for ")
} .append(String.valueOf(mJobId))
if (job.flexMillis != job.getFlexMillis()) { .append(" is ");
Log.w(TAG, "Specified interval for " + mJobService.getPackageName() + " is " formatDuration(mIntervalMillis, builder);
+ formatForLogging(mFlexMillis) + ". Clamped to " + builder.append(". Clamped to ");
formatForLogging(job.getFlexMillis())); 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; return job;
} }