From a8b91afaac647666e63fb98be11bbd6cfe3c2afe Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Tue, 9 Feb 2021 08:45:47 -0800 Subject: 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 --- .../service/java/com/android/server/job/JobSchedulerService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index bfc153f5f2f7..82ee5d8c1c7c 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -1990,8 +1990,11 @@ public class JobSchedulerService extends com.android.server.SystemService } final boolean shouldForceBatchJob; - // Restricted jobs must always be batched - if (job.getEffectiveStandbyBucket() == RESTRICTED_INDEX) { + 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 shouldForceBatchJob = true; } else if (job.getNumFailures() > 0) { shouldForceBatchJob = false; -- cgit v1.2.3-59-g8ed1b