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

Commit 9f359cc2 authored by Chris Tate's avatar Chris Tate Committed by android-build-merger
Browse files

Merge "Don't automatically decline tracking jobs with met initial delays" into... 

Merge "Don't automatically decline tracking jobs with met initial delays" into pi-dev am: ed9f3ef9
am: 13b55002

Change-Id: Ic2a5a1df4c9b12c02a46fc3384bfa2dc863d60ac
parents a65308d2 13b55002

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -90,8 +90,11 @@ public final class TimeController extends StateController { 
                return;

                return;

            } else if (job.hasTimingDelayConstraint() && evaluateTimingDelayConstraint(job,

            } else if (job.hasTimingDelayConstraint() && evaluateTimingDelayConstraint(job,

                    nowElapsedMillis)) {

                    nowElapsedMillis)) {

                if (!job.hasDeadlineConstraint()) {

                    // If it doesn't have a deadline, we'll never have to touch it again.

                    return;

                    return;

                }

                }

            }





            boolean isInsert = false;

            boolean isInsert = false;

            ListIterator<JobStatus> it = mTrackedJobs.listIterator(mTrackedJobs.size());

            ListIterator<JobStatus> it = mTrackedJobs.listIterator(mTrackedJobs.size());