Merge "Small fixes to battery stats." into gingerbread (a4ce31f5) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1585,10 +1585,10 @@ public abstract class BatteryStats implements Parcelable {
		sb.append(ent.getKey()); sb.append(":\n");
		sb.append(prefix); sb.append(" CPU: ");
		formatTime(sb, userTime); sb.append("usr + ");
		formatTime(sb, systemTime); sb.append("krn\n");
		formatTime(sb, systemTime); sb.append("krn");
		if (starts != 0) {
		sb.append(prefix); sb.append(" "); sb.append(starts);
		sb.append(" proc starts");
		sb.append("\n"); sb.append(prefix); sb.append(" ");
		sb.append(starts); sb.append(" proc starts");
		}
		pw.println(sb.toString());
		for (int e=0; e<numExcessive; e++) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -3631,9 +3631,11 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		if (pid >= 0 && type == WAKE_TYPE_PARTIAL) {
		Pid p = getPidStatsLocked(pid);
		if (p.mWakeStart == 0) {
		p.mWakeStart = SystemClock.elapsedRealtime();
		}
		}
		}

		public void noteStopWakeLocked(int pid, String name, int type) {
		StopwatchTimer t = getWakeTimerLocked(name, type);
		@@ -3642,7 +3644,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		if (pid >= 0 && type == WAKE_TYPE_PARTIAL) {
		Pid p = mPids.get(pid);
		if (p != null) {
		if (p != null && p.mWakeStart != 0) {
		p.mWakeSum += SystemClock.elapsedRealtime() - p.mWakeStart;
		p.mWakeStart = 0;
		}