Merge "Drop TAG_FIRST_OCCURRENCE_FLAG when populating history tag array" (fd796674) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -12186,7 +12186,7 @@ public class BatteryStatsImpl extends BatteryStats {

		mHistoryTags = new SparseArray<>(mHistoryTagPool.size());
		for (Map.Entry<HistoryTag, Integer> entry: mHistoryTagPool.entrySet()) {
		mHistoryTags.put(entry.getValue(), entry.getKey());
		mHistoryTags.put(entry.getValue() & ~TAG_FIRST_OCCURRENCE_FLAG, entry.getKey());
		}
		}

		@@ -16345,9 +16345,6 @@ public class BatteryStatsImpl extends BatteryStats {
		for (int i=0; i<numTags; i++) {
		int idx = in.readInt();
		String str = in.readString();
		if (str == null) {
		throw new ParcelFormatException("null history tag string");
		}
		int uid = in.readInt();
		HistoryTag tag = new HistoryTag();
		tag.string = str;