From 9ec24237e60a47a88f197d31095638f66a018659 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Fri, 8 Apr 2022 20:41:05 +0000 Subject: [PATCH] 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 --- .../java/com/android/server/job/JobConcurrencyManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 b4238c975d985..c8ec89475050f 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java @@ -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);