Merge "Stop the actual job in question." into tm-dev am: 368b3a7c0a am: 36ca3bdd6b

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

Change-Id: I295536cf49d78e00871af13c3c21fa377ea88cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-13 22:33:27 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}