diff options
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java | 7 |
1 files 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; |