commit 9a916e5602908f579ac846680270677c5a89e5a4
author Joe Onorato <joeo@google.com> Thu Apr 14 21:10:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 14 21:10:16 2016 +0000
tree 4a56703a46b8c17d9c2033020d9661bc24119b1e
parent 3ee2cc630d2782637461e59049e99bb8d72326b7
parent 388fc336b3f5c31df70fa01cf130f86b8c8d545f

Merge "Add support for null tag names from apps." into nyc-dev

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

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index bbefcb5..10afdb8 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -1745,6 +1745,9 @@
         }
 
         public void add(String name, T obj) {
+            if (name == null) {
+                name = "";
+            }
             mMap.put(name, obj);
             if (OVERFLOW_NAME.equals(name)) {
                 mCurOverflow = obj;
@@ -1776,6 +1779,9 @@
         }
 
         public T startObject(String name) {
+            if (name == null) {
+                name = "";
+            }
             T obj = mMap.get(name);
             if (obj != null) {
                 return obj;
@@ -1825,6 +1831,9 @@
         }
 
         public T stopObject(String name) {
+            if (name == null) {
+                name = "";
+            }
             T obj = mMap.get(name);
             if (obj != null) {
                 return obj;