From a382f81b83484e2adff76322bea9185b9edf138c Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Wed, 14 Dec 2022 20:24:25 +0000 Subject: [PATCH] Don't force batch user-initiated jobs. Bug: 261999509 Test: N/A Change-Id: I99735984e7911ab5ada8437e094f4bac1fb1a9b4 --- .../java/com/android/server/job/JobSchedulerService.java | 4 ++-- 1 file changed, 2 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 6f58c7ce626c6..6bbad04c765a4 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -2850,8 +2850,8 @@ public class JobSchedulerService extends com.android.server.SystemService } final boolean shouldForceBatchJob; - if (job.shouldTreatAsExpeditedJob()) { - // Never batch expedited jobs, even for RESTRICTED apps. + if (job.shouldTreatAsExpeditedJob() || job.shouldTreatAsUserInitiated()) { + // Never batch expedited or user-initiated jobs, even for RESTRICTED apps. shouldForceBatchJob = false; } else if (job.getEffectiveStandbyBucket() == RESTRICTED_INDEX) { // Restricted jobs must always be batched