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

Commit f2e0249a authored Apr 09, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Apr 09, 2022

Merge "Stop tracking ghost jobs." into tm-dev am: 323def83

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17664330

Change-Id: I44c17abb71aca8c15fe62b73b4addbacf9479e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 9748cafb 323def83

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -1745,7 +1745,13 @@ public class JobSchedulerService extends com.android.server.SystemService

		// Remove from store as well as controllers.
		final boolean removed = mJobs.remove(jobStatus, removeFromPersisted);
		if (removed && mReadyToRock) {
		if (!removed) {
		// We never create JobStatus objects for the express purpose of removing them, and this
		// method is only ever called for jobs that were saved in the JobStore at some point,
		// so if we can't find it, something went seriously wrong.
		Slog.wtfStack(TAG, "Job didn't exist in JobStore");
		}
		if (mReadyToRock) {
		for (int i = 0; i < mControllers.size(); i++) {
		StateController controller = mControllers.get(i);
		controller.maybeStopTrackingJobLocked(jobStatus, incomingJob, false);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -992,6 +992,10 @@ public final class JobServiceContext implements ServiceConnection {
		if (mVerb == VERB_FINISHED) {
		return;
		}
		if (DEBUG) {
		Slog.d(TAG, "Cleaning up " + mRunningJob.toShortString()
		+ " reschedule=" + reschedule + " reason=" + reason);
		}
		applyStoppedReasonLocked(reason);
		completedJob = mRunningJob;
		final int internalStopReason = mParams.getInternalStopReasonCode();