diff options
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index a4a76a8831a1..53484d2a0618 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -7354,9 +7354,11 @@ public abstract class BatteryStats implements Parcelable { pw.print(getHistoryTagPoolUid(i)); pw.print(",\""); String str = getHistoryTagPoolString(i); - str = str.replace("\\", "\\\\"); - str = str.replace("\"", "\\\""); - pw.print(str); + if (str != null) { + str = str.replace("\\", "\\\\"); + str = str.replace("\"", "\\\""); + pw.print(str); + } pw.print("\""); pw.println(); } diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 06d68e049ac5..3aac0b18a7fc 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -3522,6 +3522,10 @@ public class BatteryStatsImpl extends BatteryStats { * <code>(index | TAG_FIRST_OCCURRENCE_FLAG)</code> */ private int writeHistoryTag(HistoryTag tag) { + if (tag.string == null) { + Slog.wtfStack(TAG, "writeHistoryTag called with null name"); + } + Integer idxObj = mHistoryTagPool.get(tag); int idx; if (idxObj != null) { |