Merge "Reset STATE2_EXTENSIONS_FLAG when unused and on every new buffer" (5b5e0941) · Commits · e / os / android_frameworks_base

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) {