Merge "Correctly reschedule failed periodic" into mnc-dr-dev (40ec3a92) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/job/JobSchedulerService.java

+16 −7

Original line number	Diff line number	Diff line
		@@ -443,13 +443,16 @@ public class JobSchedulerService extends com.android.server.SystemService
		}

		/**
		* A job is rescheduled with exponential back-off if the client requests this from their
		* execution logic.
		* A caveat is for idle-mode jobs, for which the idle-mode constraint will usurp the
		* timeliness of the reschedule. For an idle-mode job, no deadline is given.
		* Reschedules the given job based on the job's backoff policy. It doesn't make sense to
		* specify an override deadline on a failed job (the failed job will run even though it's not
		* ready), so we reschedule it with {@link JobStatus#NO_LATEST_RUNTIME}, but specify that any
		* ready job with {@link JobStatus#numFailures} > 0 will be executed.
		*
		* @param failureToReschedule Provided job status that we will reschedule.
		* @return A newly instantiated JobStatus with the same constraints as the last job except
		* with adjusted timing constraints.
		*
		* @see JobHandler#maybeQueueReadyJobsForExecutionLockedH
		*/
		private JobStatus getRescheduleJobForFailure(JobStatus failureToReschedule) {
		final long elapsedNowMillis = SystemClock.elapsedRealtime();
		@@ -479,8 +482,9 @@ public class JobSchedulerService extends com.android.server.SystemService
		}

		/**
		* Called after a periodic has executed so we can to re-add it. We take the last execution time
		* of the job to be the time of completion (i.e. the time at which this function is called).
		* Called after a periodic has executed so we can reschedule it. We take the last execution
		* time of the job to be the time of completion (i.e. the time at which this function is
		* called).
		* This could be inaccurate b/c the job can run for as long as
		* {@link com.android.server.job.JobServiceContext#EXECUTING_TIMESLICE_MILLIS}, but will lead
		* to underscheduling at least, rather than if we had taken the last execution time to be the
		@@ -491,7 +495,12 @@ public class JobSchedulerService extends com.android.server.SystemService
		private JobStatus getRescheduleJobForPeriodic(JobStatus periodicToReschedule) {
		final long elapsedNow = SystemClock.elapsedRealtime();
		// Compute how much of the period is remaining.
		long runEarly = Math.max(periodicToReschedule.getLatestRunTimeElapsed() - elapsedNow, 0);
		long runEarly = 0L;

		// If this periodic was rescheduled it won't have a deadline.
		if (periodicToReschedule.hasDeadlineConstraint()) {
		runEarly = Math.max(periodicToReschedule.getLatestRunTimeElapsed() - elapsedNow, 0L);
		}
		long newEarliestRunTimeElapsed = elapsedNow + runEarly;
		long period = periodicToReschedule.getJob().getIntervalMillis();
		long newLatestRuntimeElapsed = newEarliestRunTimeElapsed + period;

services/core/java/com/android/server/job/JobServiceContext.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ public class JobServiceContext extends IJobCallback.Stub implements ServiceConne
		private static final int defaultMaxActiveJobsPerService =
		ActivityManager.isLowRamDeviceStatic() ? 1 : 3;
		/** Amount of time a job is allowed to execute for before being considered timed-out. */
		private static final long EXECUTING_TIMESLICE_MILLIS = 10 * 60 * 1000;
		private static final long EXECUTING_TIMESLICE_MILLIS = 10 * 60 * 1000; // 10mins.
		/** Amount of time the JobScheduler will wait for a response from an app for a message. */
		private static final long OP_TIMEOUT_MILLIS = 8 * 1000;