summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-09 23:10:38 -0700
committerDianne Hackborn <hackbod@google.com>2010-09-09 23:10:38 -0700
commit618b8c1e988ac6c8006da66ca9e8a1e1d49c9dd5 (patch)
treea77df89091e7f37f1d786671aefbf6526233a6ad /core/java/com
parenta7d868d4f99dfaf85e13498210aecf1ad8efd859 (diff)
downloadframeworks_base-618b8c1e988ac6c8006da66ca9e8a1e1d49c9dd5.zip
frameworks_base-618b8c1e988ac6c8006da66ca9e8a1e1d49c9dd5.tar.gz
frameworks_base-618b8c1e988ac6c8006da66ca9e8a1e1d49c9dd5.tar.bz2
DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Change-Id: If571d3ff5e73252a0653c30ec40178ec1591ddd9
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java10
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 c82fef0..0ef1ea5 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -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);