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

Commit 4acc89dd authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Never force batch expedited jobs." into sc-dev am: 7b9ad2f6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cc31067d99875ea8f9efeb2e16870d194903f5e
parents 93d9608b 7b9ad2f6

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

+5 −2
Original line number Diff line number Diff line
@@ -1990,8 +1990,11 @@ public class JobSchedulerService extends com.android.server.SystemService 
                }



                final boolean shouldForceBatchJob;

                if (job.shouldTreatAsExpeditedJob()) {

                    // Never batch expedited jobs, even for RESTRICTED apps.

                    shouldForceBatchJob = false;

                } else if (job.getEffectiveStandbyBucket() == RESTRICTED_INDEX) {

                    // Restricted jobs must always be batched

                if (job.getEffectiveStandbyBucket() == RESTRICTED_INDEX) {

                    shouldForceBatchJob = true;

                } else if (job.getNumFailures() > 0) {

                    shouldForceBatchJob = false;