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

Commit aa3dbde0 authored by Kweku Adams's avatar Kweku Adams Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-d5f746d3f5a042c2874e68e6ef543b23" into tm-mainline-prod 

* changes:
  [automerge] Fix starting job logging. 2p: 9ec24237
  Fix starting job logging.
parents a564c97b 2738a78b

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

+3 −3
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ class JobConcurrencyManager { 
            }

            if (highestBiasJob != null) {

                if (DEBUG) {

                    Slog.d(TAG, "Running job " + jobStatus + " as preemption");

                    Slog.d(TAG, "Running job " + highestBiasJob + " as preemption");

                }

                mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes);

                startJobLocked(worker, highestBiasJob, highBiasWorkType);
@@ -1219,7 +1219,7 @@ class JobConcurrencyManager { 
                worker.clearPreferredUid();

                if (backupJob != null) {

                    if (DEBUG) {

                        Slog.d(TAG, "Running job " + jobStatus + " instead");

                        Slog.d(TAG, "Running job " + backupJob + " instead");

                    }

                    mWorkCountTracker.stageJob(backupWorkType, backupAllWorkTypes);

                    startJobLocked(worker, backupJob, backupWorkType);
@@ -1263,7 +1263,7 @@ class JobConcurrencyManager { 
                // This slot is free, and we haven't yet hit the limit on

                // concurrent jobs...  we can just throw the job in to here.

                if (DEBUG) {

                    Slog.d(TAG, "About to run job: " + jobStatus);

                    Slog.d(TAG, "About to run job: " + highestBiasJob);

                }

                mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes);

                startJobLocked(worker, highestBiasJob, highBiasWorkType);