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

Truncate battery history tags and remove Log.wtf

Browse Source 
Bug: 216559196
Test: atest FrameworksCoreTests:BatteryStatsTests

Change-Id: I252ef24e1bbf9fb9210b3830dd37277de92c763d
This commit is contained in:
Dmitri Plotnikov
2022-03-31 11:57:51 -07:00
parent 953115987f
commit 0d1965421d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -719,7 +719,7 @@ public class BatteryStatsImpl extends BatteryStats {
int mNumHistoryItems;
private static final int HISTORY_TAG_INDEX_LIMIT = 0x7ffe;
private static final int MAX_HISTORY_TAG_STRING_LENGTH = 256;
private static final int MAX_HISTORY_TAG_STRING_LENGTH = 1024;
final HashMap<HistoryTag, Integer> mHistoryTagPool = new HashMap<>();
private SparseArray<HistoryTag> mHistoryTags;
@@ -3970,6 +3970,12 @@ public class BatteryStatsImpl extends BatteryStats {
Slog.wtfStack(TAG, "writeHistoryTag called with null name");
}
final int stringLength = tag.string.length();
if (stringLength > MAX_HISTORY_TAG_STRING_LENGTH) {
Slog.e(TAG, "Long battery history tag: " + tag.string);
tag.string = tag.string.substring(0, MAX_HISTORY_TAG_STRING_LENGTH);
}
Integer idxObj = mHistoryTagPool.get(tag);
int idx;
if (idxObj != null) {
@@ -3986,11 +3992,6 @@ public class BatteryStatsImpl extends BatteryStats {
tag.poolIdx = idx;
mHistoryTagPool.put(key, idx);
mNextHistoryTagIdx++;
final int stringLength = key.string.length();
if (stringLength > MAX_HISTORY_TAG_STRING_LENGTH) {
Slog.wtf(TAG, "Long battery history tag: " + key.string);
}
mNumHistoryTagChars += stringLength + 1;
if (mHistoryTags != null) {