Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix charging reporting logic.

Browse Source 
The JobStatus.set*Satisfied APIs return whether the value changed, not
the previous value. Fix BatteryController's perception and logic of the
returned value. BC ended up notifying JobSchedulerService about changes
anyway, but this now has more correct logic.

Bug: 141645789
Test: atest CtsJobSchedulerTestCases
Change-Id: I2632977f8869470416c5223574cf42d107e71128
This commit is contained in:
Kweku Adams
2021-07-20 07:33:54 -07:00
parent 7efcc4dfc7
commit 8d3c8782c1
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java
View File

@@ -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.