commit fa5de8763ef0f337fad1ce817a735fb9f7e01ef7
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 14 22:54:44 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 14 22:54:44 2022 +0000
tree 5a1034261258f8de2d273d85cbeb853d2216f0c3
parent 94e9ed08483b87323f0c1234dd26edc59820759d
parent 90bf48b3741814624217f388cb97dd68cd750241

Merge "Make sure user-initiated jobs can run in Doze & Battery Saver."

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
index 702b7e0..251a4da 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
@@ -1382,12 +1382,14 @@
         return appHasDozeExemption
                 || (getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) != 0
                 || ((shouldTreatAsExpeditedJob() || startedAsExpeditedJob)
+                || shouldTreatAsUserInitiated()
                 && (mDynamicConstraints & CONSTRAINT_DEVICE_NOT_DOZING) == 0);
     }
 
     boolean canRunInBatterySaver() {
         return (getInternalFlags() & INTERNAL_FLAG_HAS_FOREGROUND_EXEMPTION) != 0
                 || ((shouldTreatAsExpeditedJob() || startedAsExpeditedJob)
+                || shouldTreatAsUserInitiated()
                 && (mDynamicConstraints & CONSTRAINT_BACKGROUND_NOT_RESTRICTED) == 0);
     }