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

Commit 39b04999 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Reevaluate constraints on run command." into rvc-dev am: c3e1b7dd 

Change-Id: I6bf3f1c59f79f222b12ace8b9dcb4eed68940cb9
parents ee99da2a c3e1b7dd

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -2833,6 +2833,13 @@ public class JobSchedulerService extends com.android.server.SystemService 
                }

                }





                js.overrideState = (force) ? JobStatus.OVERRIDE_FULL : JobStatus.OVERRIDE_SOFT;

                js.overrideState = (force) ? JobStatus.OVERRIDE_FULL : JobStatus.OVERRIDE_SOFT;



                // Re-evaluate constraints after the override is set in case one of the overridden

                // constraints was preventing another constraint from thinking it needed to update.

                for (int c = mControllers.size() - 1; c >= 0; --c) {

                    mControllers.get(c).reevaluateStateLocked(uid);

                }



                if (!js.isConstraintsSatisfied()) {

                if (!js.isConstraintsSatisfied()) {

                    js.overrideState = 0;

                    js.overrideState = 0;

                    return JobSchedulerShellCommand.CMD_ERR_CONSTRAINTS;

                    return JobSchedulerShellCommand.CMD_ERR_CONSTRAINTS;