From 87f7b33534efa967b15fe7b68da8b7cc43bf391d Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Fri, 28 Jan 2022 23:10:32 +0000 Subject: [PATCH] Update callback delay when constant changes. Update the delay of the ACTION_CHARGING/DISCHARGING broadcast whenever the delay constant is updated to ensure that tests can run smoothly. Bug: 214599394 Test: atest --rerun-until-failure 25 CtsJobSchedulerTestCases:BatteryConstraintTest Test: atest --rerun-until-failure 25 CtsJobSchedulerTestCases:JobThrottlingTest Change-Id: Ic664fa58edb3cab9980759baf356457158f66ead --- core/java/com/android/internal/os/BatteryStatsImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 8213c863875c5..74047efd42cda 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -16109,6 +16109,11 @@ public class BatteryStatsImpl extends BatteryStats { BATTERY_CHARGED_DELAY_MS = delay >= 0 ? delay : mParser.getInt( KEY_BATTERY_CHARGED_DELAY_MS, DEFAULT_BATTERY_CHARGED_DELAY_MS); + + if (mHandler.hasCallbacks(mDeferSetCharging)) { + mHandler.removeCallbacks(mDeferSetCharging); + mHandler.postDelayed(mDeferSetCharging, BATTERY_CHARGED_DELAY_MS); + } } private void updateKernelUidReadersThrottleTime(long oldTimeMs, long newTimeMs) {