diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-09 23:14:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 23:14:46 -0700 |
| commit | 8615fdc15146d27cc2d3a8efbe57f0a425b19efb (patch) | |
| tree | 94533f6a193ebc481e5d3c132ca7e57333d12c48 /core/java/com | |
| parent | 510951e98bdb861130f38c087956cd05e0b41dcd (diff) | |
| parent | 506d724cc356a7ba73995ef2929c65062277c83d (diff) | |
| download | frameworks_base-8615fdc15146d27cc2d3a8efbe57f0a425b19efb.zip frameworks_base-8615fdc15146d27cc2d3a8efbe57f0a425b19efb.tar.gz frameworks_base-8615fdc15146d27cc2d3a8efbe57f0a425b19efb.tar.bz2 | |
am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread
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!
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index c669897..b9f0c61 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -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) { - 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); |