Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
This commit is contained in:
Dianne Hackborn
2010-09-09 23:14:46 -07:00
committed by Android Git Automerger
parent 510951e98b 506d724cc3
commit 8615fdc151
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

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