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

Commit 9ec24237 authored by Kweku Adams's avatar Kweku Adams
Browse files

Fix starting job logging. 

We were accidentally logging that we were about to start the last job in
the pending queue instead of the job we intended to start.

Bug: 141645789
Test: Enable verbose logging and read logcat
Change-Id: I37edb3fe9b1d55ebc4587bd15677330c89bff923
parent e3c41047

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);