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

Commit 44a05269 authored by Matthew Williams's avatar Matthew Williams Committed by android-build-merger
Browse files

am 28358eae: Merge "Fixing to fail... 

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

* commit '9dfe4ff4':
  Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
parents c136973a 9dfe4ff4

services/core/java/com/android/server/job/controllers/TimeController.java

+6 −0
Original line number Diff line number Diff line
@@ -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,