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

Commit 3d1fd422 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Reset STATE2_EXTENSIONS_FLAG when unused and on every new buffer 

Bug: 244500357
Test: atest FrameworksServicesTests:BatteryStatsTests
Change-Id: Iaaedf2c47c982855bcc66b2673a6c82281c93d0a
parent f437c2c2

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -1235,6 +1235,8 @@ public class BatteryStatsHistory { 
            for (Map.Entry<HistoryTag, Integer> entry : mHistoryTagPool.entrySet()) {

            for (Map.Entry<HistoryTag, Integer> entry : mHistoryTagPool.entrySet()) {

                entry.setValue(entry.getValue() | BatteryStatsHistory.TAG_FIRST_OCCURRENCE_FLAG);

                entry.setValue(entry.getValue() | BatteryStatsHistory.TAG_FIRST_OCCURRENCE_FLAG);

            }

            }

            mMeasuredEnergyHeaderWritten = false;



            // Make a copy of mHistoryCur.

            // Make a copy of mHistoryCur.

            HistoryItem copy = new HistoryItem();

            HistoryItem copy = new HistoryItem();

            copy.setTo(cur);

            copy.setTo(cur);
@@ -1400,6 +1402,8 @@ public class BatteryStatsHistory { 
        }

        }

        if (extensionFlags != 0) {

        if (extensionFlags != 0) {

            cur.states2 |= HistoryItem.STATE2_EXTENSIONS_FLAG;

            cur.states2 |= HistoryItem.STATE2_EXTENSIONS_FLAG;

        } else {

            cur.states2 &= ~HistoryItem.STATE2_EXTENSIONS_FLAG;

        }

        }

        final boolean state2IntChanged = cur.states2 != last.states2;

        final boolean state2IntChanged = cur.states2 != last.states2;

        if (state2IntChanged) {

        if (state2IntChanged) {