Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6ded1ba authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 

Merge commit '195dc210'

* commit '195dc210':
  Small fixes to battery stats.
parents 6245480c 195dc210

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++) {

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

+4 −2
Original line number Diff line number Diff line
@@ -3633,9 +3633,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);
@@ -3644,7 +3646,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;

                }