From 388fc336b3f5c31df70fa01cf130f86b8c8d545f Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Tue, 12 Apr 2016 17:06:47 -0700
Subject: [PATCH] Add support for null tag names from apps.

For Wakelocks and syncs there is no requirement that an app actually
supply a tag/name.  Jobs will always have system-supplied tags.

Bug: 26276001
Change-Id: Ie3b8e48a395de1506a2f15d5b9c9eab726bc6d0a
---
 core/java/com/android/internal/os/BatteryStatsImpl.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index bbefcb58a36b3..10afdb8ef109e 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -1745,6 +1745,9 @@ public class BatteryStatsImpl extends BatteryStats {
         }
 
         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 class BatteryStatsImpl extends BatteryStats {
         }
 
         public T startObject(String name) {
+            if (name == null) {
+                name = "";
+            }
             T obj = mMap.get(name);
             if (obj != null) {
                 return obj;
@@ -1825,6 +1831,9 @@ public class BatteryStatsImpl extends BatteryStats {
         }
 
         public T stopObject(String name) {
+            if (name == null) {
+                name = "";
+            }
             T obj = mMap.get(name);
             if (obj != null) {
                 return obj;