Merge "Reevaluate constraints on run command." into rvc-dev am: c3e1b7ddff am: 39b049991a

Change-Id: I8403933d4b48526d0927f595446022d0f898f7a3

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

@@ -2833,6 +2833,13 @@ public class JobSchedulerService extends com.android.server.SystemService
                 }
 
                 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()) {
                     js.overrideState = 0;
                     return JobSchedulerShellCommand.CMD_ERR_CONSTRAINTS;