Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix starting job logging.

Browse Source 
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
This commit is contained in:
Kweku Adams
2022-04-08 20:41:05 +00:00
parent e3c41047b4
commit 9ec24237e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java
View File

@@ -1208,7 +1208,7 @@ class JobConcurrencyManager {
} }
if (highestBiasJob != null) { if (highestBiasJob != null) {
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "Running job " + jobStatus + " as preemption"); Slog.d(TAG, "Running job " + highestBiasJob + " as preemption");
} }
mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes); mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes);
startJobLocked(worker, highestBiasJob, highBiasWorkType); startJobLocked(worker, highestBiasJob, highBiasWorkType);
@@ -1219,7 +1219,7 @@ class JobConcurrencyManager {
worker.clearPreferredUid(); worker.clearPreferredUid();
if (backupJob != null) { if (backupJob != null) {
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "Running job " + jobStatus + " instead"); Slog.d(TAG, "Running job " + backupJob + " instead");
} }
mWorkCountTracker.stageJob(backupWorkType, backupAllWorkTypes); mWorkCountTracker.stageJob(backupWorkType, backupAllWorkTypes);
startJobLocked(worker, backupJob, backupWorkType); startJobLocked(worker, backupJob, backupWorkType);
@@ -1263,7 +1263,7 @@ class JobConcurrencyManager {
// This slot is free, and we haven't yet hit the limit on // This slot is free, and we haven't yet hit the limit on
// concurrent jobs... we can just throw the job in to here. // concurrent jobs... we can just throw the job in to here.
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "About to run job: " + jobStatus); Slog.d(TAG, "About to run job: " + highestBiasJob);
} }
mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes); mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes);
startJobLocked(worker, highestBiasJob, highBiasWorkType); startJobLocked(worker, highestBiasJob, highBiasWorkType);