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

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

Browse Source 
am: 9a916e5

* commit '9a916e5602908f579ac846680270677c5a89e5a4':
  Add support for null tag names from apps.

Change-Id: Iff0ce8b4faeb935e70ce9bef6fba322707e5aa7d
This commit is contained in:
Joe Onorato
2016-04-14 21:17:03 +00:00
committed by android-build-merger
parent d66e913d24 9a916e5602
commit ef9bc11ddb
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1745,6 +1745,9 @@ public class BatteryStatsImpl extends BatteryStats {
} }
public void add(String name, T obj) { public void add(String name, T obj) {
if (name == null) {
name = "";
}
mMap.put(name, obj); mMap.put(name, obj);
if (OVERFLOW_NAME.equals(name)) { if (OVERFLOW_NAME.equals(name)) {
mCurOverflow = obj; mCurOverflow = obj;
@@ -1776,6 +1779,9 @@ public class BatteryStatsImpl extends BatteryStats {
} }
public T startObject(String name) { public T startObject(String name) {
if (name == null) {
name = "";
}
T obj = mMap.get(name); T obj = mMap.get(name);
if (obj != null) { if (obj != null) {
return obj; return obj;
@@ -1825,6 +1831,9 @@ public class BatteryStatsImpl extends BatteryStats {
} }
public T stopObject(String name) { public T stopObject(String name) {
if (name == null) {
name = "";
}
T obj = mMap.get(name); T obj = mMap.get(name);
if (obj != null) { if (obj != null) {
return obj; return obj;