Merge "Only print out wake locks in the if the wakelock was held." into gingerbread (29e25bd3) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1237,13 +1237,12 @@ public abstract class BatteryStats implements Parcelable {
	linePrefix);		linePrefix);
	if (!linePrefix.equals(": ")) {		if (!linePrefix.equals(": ")) {
	sb.append(" realtime");		sb.append(" realtime");
	} else {		// Only print out wake locks that were held
	sb.append(": (nothing executed)");
	}
	pw.println(sb.toString());		pw.println(sb.toString());
	}		}
	}		}
	}		}
			}

	for (int iu = 0; iu < NU; iu++) {		for (int iu = 0; iu < NU; iu++) {
	Uid u = uidStats.valueAt(iu);		Uid u = uidStats.valueAt(iu);
	@@ -1453,13 +1452,12 @@ public abstract class BatteryStats implements Parcelable {
	"window", which, linePrefix);		"window", which, linePrefix);
	if (!linePrefix.equals(": ")) {		if (!linePrefix.equals(": ")) {
	sb.append(" realtime");		sb.append(" realtime");
	} else {		// Only print out wake locks that were held
	sb.append(": (nothing executed)");
	}
	pw.println(sb.toString());		pw.println(sb.toString());
	uidActivity = true;		uidActivity = true;
	}		}
	}		}
			}

	Map<Integer, ? extends BatteryStats.Uid.Sensor> sensors = u.getSensorStats();		Map<Integer, ? extends BatteryStats.Uid.Sensor> sensors = u.getSensorStats();
	if (sensors.size() > 0) {		if (sensors.size() > 0) {