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

Commit 10716d37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-ea18b7bdcd494f359caebde79f549279" 

* changes:
  [automerge] Remove cancelled job from evaluation list. 2p: be7816af 2p: 16f9e6cc
  [automerge] Remove cancelled job from evaluation list. 2p: be7816af
  Remove cancelled job from evaluation list.
parents 537914be 4b29122c

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

+1 −0
Original line number Diff line number Diff line
@@ -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);