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

Merge "Remove running jobs from pending list." into tm-dev am: 444880f046

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943212

Change-Id: I5016ae0d5a07d6dd67e46480673796a795709c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kweku Adams
2022-04-27 20:02:47 +00:00
committed by Automerger Merge Worker
parent 319d2df9bd 444880f046
commit e9069b1945
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -690,6 +690,12 @@ class JobConcurrencyManager {
int projectedRunningCount = numRunningJobs;
while ((nextPending = pendingJobQueue.next()) != null) {
if (mRunningJobs.contains(nextPending)) {
// Should never happen.
Slog.wtf(TAG, "Pending queue contained a running job");
if (DEBUG) {
Slog.e(TAG, "Pending+running job: " + nextPending);
}
pendingJobQueue.remove(nextPending);
continue;
}
@@ -1137,7 +1143,8 @@ class JobConcurrencyManager {
}
}
if (mActiveServices.size() >= STANDARD_CONCURRENCY_LIMIT) {
final PendingJobQueue pendingJobQueue = mService.getPendingJobQueue();
if (mActiveServices.size() >= STANDARD_CONCURRENCY_LIMIT || pendingJobQueue.size() == 0) {
worker.clearPreferredUid();
// We're over the limit (because the TOP app scheduled a lot of EJs). Don't start
// running anything new until we get back below the limit.
@@ -1145,7 +1152,6 @@ class JobConcurrencyManager {
return;
}
final PendingJobQueue pendingJobQueue = mService.getPendingJobQueue();
if (worker.getPreferredUid() != JobServiceContext.NO_PREFERRED_UID) {
updateCounterConfigLocked();
// Preemption case needs special care.
@@ -1162,6 +1168,12 @@ class JobConcurrencyManager {
pendingJobQueue.resetIterator();
while ((nextPending = pendingJobQueue.next()) != null) {
if (mRunningJobs.contains(nextPending)) {
// Should never happen.
Slog.wtf(TAG, "Pending queue contained a running job");
if (DEBUG) {
Slog.e(TAG, "Pending+running job: " + nextPending);
}
pendingJobQueue.remove(nextPending);
continue;
}
@@ -1239,6 +1251,12 @@ class JobConcurrencyManager {
while ((nextPending = pendingJobQueue.next()) != null) {
if (mRunningJobs.contains(nextPending)) {
// Should never happen.
Slog.wtf(TAG, "Pending queue contained a running job");
if (DEBUG) {
Slog.e(TAG, "Pending+running job: " + nextPending);
}
pendingJobQueue.remove(nextPending);
continue;
}