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

Commit a8b91afa authored by Kweku Adams's avatar Kweku Adams
Browse files

Never force batch expedited jobs. 

Make sure we don't defer expedited jobs because we tried to force batch
them.

Bug: 171305774
Test: atest CtsJobSchedulerTestCases
Change-Id: I6260307c3ebfd2c5aff156f43ea6d096c879d155
parent 8fddb7a4

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;