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

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

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

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

Merge commit '506d724c' into gingerbread-plus-aosp

* commit '506d724c':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
parents 510951e9 506d724c

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

+5 −5
Original line number Diff line number Diff line
@@ -1378,13 +1378,13 @@ public final class BatteryStatsImpl extends BatteryStats { 
                for (int i=0; i<N; i++) {

                    StopwatchTimer st = mPartialTimers.get(i);

                    if (st.mInList) {

                        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 uid = st.mUid;

                        if (uid != null && uid.mUid != Process.SYSTEM_UID) {

                            Uid.Proc proc = uid.getProcessStatsLocked("*wakelock*");

                            proc.addCpuTimeLocked(myUTime, mySTime);

                            proc.addSpeedStepTimes(cpuSpeedTimes);