diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java index 6fd094844cd63..c3b8ba11f4b49 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java @@ -103,14 +103,8 @@ public final class BatteryController extends RestrictingController { boolean reportChange = false; for (int i = mTrackedTasks.size() - 1; i >= 0; i--) { final JobStatus ts = mTrackedTasks.valueAt(i); - boolean previous = ts.setChargingConstraintSatisfied(nowElapsed, stablePower); - if (previous != stablePower) { - reportChange = true; - } - previous = ts.setBatteryNotLowConstraintSatisfied(nowElapsed, batteryNotLow); - if (previous != batteryNotLow) { - reportChange = true; - } + reportChange |= ts.setChargingConstraintSatisfied(nowElapsed, stablePower); + reportChange |= ts.setBatteryNotLowConstraintSatisfied(nowElapsed, batteryNotLow); } if (stablePower || batteryNotLow) { // If one of our conditions has been satisfied, always schedule any newly ready jobs.