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

Commit 46de390f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "BatteryStats: Fix bogus calls to addHistoryRecordLocked."

parents 738471a9 42151571

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

+2 −2
Original line number Diff line number Diff line
@@ -3743,7 +3743,7 @@ public class BatteryStatsImpl extends BatteryStats { 














        if (mNumHistoryItems == MAX_HISTORY_ITEMS















                || mNumHistoryItems == MAX_MAX_HISTORY_ITEMS) {













            addHistoryRecordLocked(elapsedRealtimeMs, HistoryItem.CMD_OVERFLOW);













            addHistoryBufferLocked(elapsedRealtimeMs, uptimeMs, HistoryItem.CMD_OVERFLOW, cur);















        }





























        if (mNumHistoryItems >= MAX_HISTORY_ITEMS) {









@@ -3760,7 +3760,7 @@ public class BatteryStatsImpl extends BatteryStats {













            }















        }



























        addHistoryRecordLocked(elapsedRealtimeMs, HistoryItem.CMD_UPDATE);













        addHistoryBufferLocked(elapsedRealtimeMs, uptimeMs, HistoryItem.CMD_UPDATE, cur);















    }





























    public void addHistoryEventLocked(long elapsedRealtimeMs, long uptimeMs, int code,