From be7816af8f022c206a401008f8bdc25f70b645d7 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Fri, 8 Apr 2022 21:06:35 +0000 Subject: Remove cancelled job from evaluation list. The changedJobList is used as the list of jobs we should evaluate to either add to the pending list or stop from execution. Thankfully, cancelled jobs are never considered eligible to run, but removing them from the evaluation list to reduce unnecessary work. Bug: 141645789 Bug: 228334264 Test: N/A Change-Id: I6017afbb79a3e3871273cdc0a1faa97344cfcabf --- .../service/java/com/android/server/job/JobSchedulerService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index b25832c7d521..c0b1f39ee3e9 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -1387,6 +1387,7 @@ public class JobSchedulerService extends com.android.server.SystemService if (mPendingJobQueue.remove(cancelled)) { mJobPackageTracker.noteNonpending(cancelled); } + mChangedJobList.remove(cancelled); // Cancel if running. mConcurrencyManager.stopJobOnServiceContextLocked( cancelled, reason, internalReasonCode, debugReason); -- cgit v1.2.3-59-g8ed1b