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

am 9de0c930: am b3b21b46: am d4d190ca: am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev

Browse Source 
* commit '9de0c930ef7cd683c0449d051c26f31e67b3f817':
  BatteryStats: Fix units in wakelock distribution calculation
This commit is contained in:
Adam Lesinski
2015-07-14 23:56:01 +00:00
committed by Android Git Automerger
parent f8d436d852 9de0c930ef
commit b6675209e2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8073,7 +8073,7 @@ public final class BatteryStatsImpl extends BatteryStats {
timer.mUid.mSystemCpuTime.addCountLocked(systemTimeUs);
final Uid.Proc proc = timer.mUid.getProcessStatsLocked("*wakelock*");
proc.addCpuTimeLocked(userTimeUs, systemTimeUs);
proc.addCpuTimeLocked(userTimeUs / 1000, systemTimeUs / 1000);
mTempTotalCpuUserTimeUs -= userTimeUs;
mTempTotalCpuSystemTimeUs -= systemTimeUs;
@@ -8097,8 +8097,8 @@ public final class BatteryStatsImpl extends BatteryStats {
u.mSystemCpuTime.addCountLocked(mTempTotalCpuSystemTimeUs);
final Uid.Proc proc = u.getProcessStatsLocked("*lost*");
proc.addCpuTimeLocked((int) mTempTotalCpuUserTimeUs,
(int) mTempTotalCpuSystemTimeUs);
proc.addCpuTimeLocked((int) mTempTotalCpuUserTimeUs / 1000,
(int) mTempTotalCpuSystemTimeUs / 1000);
}
}