Merge "Remove unused parameter and innocuous bug." (3e17e51f) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -1833,12 +1833,13 @@ public class JobSchedulerService extends com.android.server.SystemService
		Slog.wtf(TAG, "Not yet prepared when started tracking: " + jobStatus);
		}
		jobStatus.enqueueTime = sElapsedRealtimeClock.millis();
		final boolean update = mJobs.add(jobStatus);
		final boolean update = lastJob != null;
		mJobs.add(jobStatus);
		if (mReadyToRock) {
		for (int i = 0; i < mControllers.size(); i++) {
		StateController controller = mControllers.get(i);
		if (update) {
		controller.maybeStopTrackingJobLocked(jobStatus, null, true);
		controller.maybeStopTrackingJobLocked(jobStatus, null);
		}
		controller.maybeStartTrackingJobLocked(jobStatus, lastJob);
		}
		@@ -1871,7 +1872,7 @@ public class JobSchedulerService extends com.android.server.SystemService
		if (mReadyToRock) {
		for (int i = 0; i < mControllers.size(); i++) {
		StateController controller = mControllers.get(i);
		controller.maybeStopTrackingJobLocked(jobStatus, incomingJob, false);
		controller.maybeStopTrackingJobLocked(jobStatus, incomingJob);
		}
		}
		return removed;

+4 −6

Original line number	Diff line number	Diff line
		@@ -203,13 +203,12 @@ public final class JobStore {
		}

		/**
		* Add a job to the master list, persisting it if necessary. If the JobStatus already exists,
		* it will be replaced.
		* Add a job to the master list, persisting it if necessary.
		* Similar jobs to the new job will not be removed.
		*
		* @param jobStatus Job to add.
		* @return Whether or not an equivalent JobStatus was replaced by this operation.
		*/
		public boolean add(JobStatus jobStatus) {
		boolean replaced = mJobSet.remove(jobStatus);
		public void add(JobStatus jobStatus) {
		mJobSet.add(jobStatus);
		if (jobStatus.isPersisted()) {
		maybeWriteStatusToDiskAsync();
		@@ -217,7 +216,6 @@ public final class JobStore {
		if (DEBUG) {
		Slog.d(TAG, "Added job status to store: " + jobStatus);
		}
		return replaced;
		}

		/**

+1 −2

Original line number	Diff line number	Diff line
		@@ -81,8 +81,7 @@ public final class BackgroundJobsController extends StateController {
		}

		@Override
		public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob,
		boolean forUpdate) {
		public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) {
		}

		@Override

+2 −2

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public final class BatteryController extends RestrictingController {
		}

		@Override
		public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob, boolean forUpdate) {
		public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob) {
		if (taskStatus.clearTrackingController(JobStatus.TRACKING_BATTERY)) {
		mTrackedTasks.remove(taskStatus);
		mTopStartedJobs.remove(taskStatus);
		@@ -143,7 +143,7 @@ public final class BatteryController extends RestrictingController {
		@Override
		public void stopTrackingRestrictedJobLocked(JobStatus jobStatus) {
		if (!jobStatus.hasPowerConstraint()) {
		maybeStopTrackingJobLocked(jobStatus, null, false);
		maybeStopTrackingJobLocked(jobStatus, null);
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -127,8 +127,7 @@ public class ComponentController extends StateController {
		}

		@Override
		public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob,
		boolean forUpdate) {
		public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) {
		}

		@Override