drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev

Browse Source 
* commit '28358eaed2e1858fcba7991cbd7199a25d160471':
  Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
This commit is contained in:
Matthew Williams
2015-04-06 20:30:29 +00:00
committed by Android Git Automerger
parent 0d53fcadce 28358eaed2
commit 20baa9d944
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/job/controllers/TimeController.java
View File

@ -91,14 +91,20 @@ public class TimeController extends StateController {
public synchronized void maybeStartTrackingJob(JobStatus job) { public synchronized void maybeStartTrackingJob(JobStatus job) {
if (job.hasTimingDelayConstraint() || job.hasDeadlineConstraint()) { if (job.hasTimingDelayConstraint() || job.hasDeadlineConstraint()) {
maybeStopTrackingJob(job); maybeStopTrackingJob(job);
boolean isInsert = false;
ListIterator<JobStatus> it = mTrackedJobs.listIterator(mTrackedJobs.size()); ListIterator<JobStatus> it = mTrackedJobs.listIterator(mTrackedJobs.size());
while (it.hasPrevious()) { while (it.hasPrevious()) {
JobStatus ts = it.previous(); JobStatus ts = it.previous();
if (ts.getLatestRunTimeElapsed() < job.getLatestRunTimeElapsed()) { if (ts.getLatestRunTimeElapsed() < job.getLatestRunTimeElapsed()) {
// Insert // Insert
isInsert = true;
break; break;
} }
} }
if(isInsert)
{
it.next();
}
it.add(job); it.add(job);
maybeUpdateAlarms( maybeUpdateAlarms(
job.hasTimingDelayConstraint() ? job.getEarliestRunTime() : Long.MAX_VALUE, job.hasTimingDelayConstraint() ? job.getEarliestRunTime() : Long.MAX_VALUE,