Merge "Add support for null tag names from apps." into nyc-dev (9a916e56) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;