diff options
| author | Matthew Williams <mjwilliams@google.com> | 2015-04-23 19:38:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 19:38:51 +0000 |
| commit | 9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e (patch) | |
| tree | eb4db3b7ce550e70f3af6175fe0975df594606d5 /services | |
| parent | 9dbb002c88fb85c8b3d7f512b789f183fe8361ad (diff) | |
| parent | 28358eaed2e1858fcba7991cbd7199a25d160471 (diff) | |
| download | frameworks_base-9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e.zip frameworks_base-9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e.tar.gz frameworks_base-9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e.tar.bz2 | |
am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev
* commit '28358eaed2e1858fcba7991cbd7199a25d160471':
Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/job/controllers/TimeController.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/job/controllers/TimeController.java b/services/core/java/com/android/server/job/controllers/TimeController.java index 4c6cb17..b3d7287 100644 --- a/services/core/java/com/android/server/job/controllers/TimeController.java +++ b/services/core/java/com/android/server/job/controllers/TimeController.java @@ -91,14 +91,20 @@ public class TimeController extends StateController { public synchronized void maybeStartTrackingJob(JobStatus job) { if (job.hasTimingDelayConstraint() || job.hasDeadlineConstraint()) { maybeStopTrackingJob(job); + boolean isInsert = false; ListIterator<JobStatus> it = mTrackedJobs.listIterator(mTrackedJobs.size()); while (it.hasPrevious()) { JobStatus ts = it.previous(); if (ts.getLatestRunTimeElapsed() < job.getLatestRunTimeElapsed()) { // Insert + isInsert = true; break; } } + if(isInsert) + { + it.next(); + } it.add(job); maybeUpdateAlarms( job.hasTimingDelayConstraint() ? job.getEarliestRunTime() : Long.MAX_VALUE, |