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

Commit 63392466 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Reset monotonic size of battery history on history.reset() 

Bug: 398848836
Test: atest PowerStatsTests; atest PowerStatsTestsRavenwood
Flag: EXEMPT bugfix
Change-Id: Id923ab22840efea0204c4321dc2b094da93fbbe1
parent 45a14a7d

core/java/com/android/internal/os/BatteryStatsHistory.java

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ public class BatteryStatsHistory { 
     */

    public void reset() {

        synchronized (this) {

            mMonotonicHistorySize = 0;

            initHistoryBuffer();

            if (mStore != null) {

                mStore.reset();

services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ public class BatteryUsageStatsProviderTest { 
        MockBatteryStatsImpl batteryStats = mStatsRule.getBatteryStats();

        accumulateBatteryUsageStats(batteryStats, 10000000, 0);

        // Accumulate every 200 bytes of battery history

        accumulateBatteryUsageStats(batteryStats, 200, 2);

        accumulateBatteryUsageStats(batteryStats, 200, 1);

        accumulateBatteryUsageStats(batteryStats, 50, 5);

        // Accumulate on every invocation of accumulateBatteryUsageStats

        accumulateBatteryUsageStats(batteryStats, 0, 7);