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

Merge "Truncate battery history tags and remove Log.wtf" into tm-dev am: 431f988122

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17528689

Change-Id: I32caa6462a931e04a9bedc09bce94e489cd62f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dmitri Plotnikov
2022-04-01 21:13:49 +00:00
committed by Automerger Merge Worker
parent ce4cdf7989 431f988122
commit 91450e3adf
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) {