diff options
| author | 2022-05-13 22:32:56 +0000 | |
|---|---|---|
| committer | 2022-05-13 22:32:56 +0000 | |
| commit | 36ca3bdd6b94c506f20f961adca3682153f85dab (patch) | |
| tree | 4ac1a632ec8495c78a54616d43c801fbe4f8e3d5 | |
| parent | ebff96b1cc708b1e1acd23c4e77f84c1418c12ec (diff) | |
| parent | 368b3a7c0ae80f34506cfc8597ee778d6616ae7f (diff) | |
Merge "Stop the actual job in question." into tm-dev am: 368b3a7c0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191867
Change-Id: If7535ad9572684d469b8d4c3fb54b241b8b9b229
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/JobConcurrencyManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java index afe36b5fa25a..d5a7f2851d03 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java @@ -959,7 +959,7 @@ class JobConcurrencyManager { for (int i = 0; i < mActiveServices.size(); i++) { JobServiceContext jsc = mActiveServices.get(i); final JobStatus executing = jsc.getRunningJobLocked(); - if (executing != null && executing.matches(job.getUid(), job.getJobId())) { + if (executing == job) { jsc.cancelExecutingJobLocked(reason, internalReasonCode, debugReason); return true; } |