Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Drop TAG_FIRST_OCCURRENCE_FLAG when populating history tag array"

Browse Source
This commit is contained in:
Dmitri Plotnikov
2021-11-30 19:34:30 +00:00
committed by Android (Google) Code Review
parent fecb63e7d0 8af4657207
commit fd79667461
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -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;