Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8408d8e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9 

am: f153182d

* commit 'f153182d':
  Fix logspam by JobInfo

Change-Id: I2d9f2218225a79b176f7093d2f8d1e9cb16c26a9
parents 199461fd f153182d

core/java/android/app/job/JobInfo.java

+22 −10
Original line number Diff line number Diff line
@@ -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;
@@ -760,15 +760,27 @@ public class JobInfo implements Parcelable { 
                        " setRequiresDeviceIdle is an error.");

            }

            JobInfo job = new JobInfo(this);

            if (job.isPeriodic()) {

                if (job.intervalMillis != job.getIntervalMillis()) {

                Log.w(TAG, "Specified interval for " + mJobService.getPackageName() + " is "

                        + formatForLogging(mIntervalMillis) + ". Clamped to " +

                        formatForLogging(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()) {

                Log.w(TAG, "Specified interval for " + mJobService.getPackageName() + " is "

                        + formatForLogging(mFlexMillis) + ". Clamped to " +

                        formatForLogging(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;

        }