Merge "DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!" into gingerbread

This commit is contained in:
Dianne Hackborn
2010-09-09 23:12:24 -07:00
committed by Android (Google) Code Review

View File

@ -1376,13 +1376,13 @@ public final class BatteryStatsImpl extends BatteryStats {
for (int i=0; i<N; i++) {
StopwatchTimer st = mPartialTimers.get(i);
if (st.mInList) {
int myUTime = utime/num;
int mySTime = stime/num;
utime -= myUTime;
stime -= mySTime;
num--;
Uid uid = st.mUid;
if (uid != null && uid.mUid != Process.SYSTEM_UID) {
int myUTime = utime/num;
int mySTime = stime/num;
utime -= myUTime;
stime -= mySTime;
num--;
Uid.Proc proc = uid.getProcessStatsLocked("*wakelock*");
proc.addCpuTimeLocked(myUTime, mySTime);
proc.addSpeedStepTimes(cpuSpeedTimes);