diff options
| author | Matthew Williams <mjwilliams@google.com> | 2015-04-23 22:24:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-04-23 22:24:34 +0000 |
| commit | 44a05269eeca97036e1d0cf769de4585b8b4f931 (patch) | |
| tree | 579e6516aad6b7e6449e0a5c90b553acf5278222 /services/core/java/com | |
| parent | c136973a435d90c95d721943616d8c3a147b10bd (diff) | |
| parent | 9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e (diff) | |
| download | frameworks_base-44a05269eeca97036e1d0cf769de4585b8b4f931.zip frameworks_base-44a05269eeca97036e1d0cf769de4585b8b4f931.tar.gz frameworks_base-44a05269eeca97036e1d0cf769de4585b8b4f931.tar.bz2 | |
am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev
automerge: 9dfe4ff
* commit '9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e':
Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
Diffstat (limited to 'services/core/java/com')
| -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, |