diff options
| author | 2022-04-11 15:40:07 +0000 | |
|---|---|---|
| committer | 2022-04-11 15:40:07 +0000 | |
| commit | 9ef7cee4d0d4542cbd1324c29b6eae08c342b8eb (patch) | |
| tree | bc4690f5b47e1af5f108be03cea96b2ba45b7219 | |
| parent | 684dd39669c705f58a9eef9e2f66137ca545e4df (diff) | |
| parent | ff2c2c8aa044ff9ba71eec48bbcbe82e0ee7ac9a (diff) | |
Merge "Remove cancelled job from evaluation list." into tm-dev am: ff2c2c8aa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17663060
Change-Id: Ie232691fab0552d5d6a901f6e17ad541f66cf707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 25db58ed6261..aad8f9da6226 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); |