diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-03-09 20:36:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-09 20:36:58 +0000 |
| commit | 442361c500c090c0db03fd4b68a68692fc48a3d7 (patch) | |
| tree | 93fae998a2a17aba55a66f1d2f752bab42d31a1b /core/java/com/android/internal/os/BatteryStatsHelper.java | |
| parent | 5844bd4096ee685b640f7cae3ae6ed26b7f00002 (diff) | |
| parent | 62793e4382b4b0b53d7373d92a62dc4e3ccbde05 (diff) | |
| download | frameworks_base-442361c500c090c0db03fd4b68a68692fc48a3d7.zip frameworks_base-442361c500c090c0db03fd4b68a68692fc48a3d7.tar.gz frameworks_base-442361c500c090c0db03fd4b68a68692fc48a3d7.tar.bz2 | |
Merge "Battery stats issues: fix jiffy handling, print scan counts."
Diffstat (limited to 'core/java/com/android/internal/os/BatteryStatsHelper.java')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsHelper.java b/core/java/com/android/internal/os/BatteryStatsHelper.java index eae4427..5d73be0 100644 --- a/core/java/com/android/internal/os/BatteryStatsHelper.java +++ b/core/java/com/android/internal/os/BatteryStatsHelper.java @@ -425,8 +425,8 @@ public final class BatteryStatsHelper { final long userTime = ps.getUserTime(which); final long systemTime = ps.getSystemTime(which); final long foregroundTime = ps.getForegroundTime(which); - cpuFgTime += foregroundTime * 10; // convert to millis - final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis + cpuFgTime += foregroundTime; + final long tmpCpuTime = userTime + systemTime; int totalTimeAtSpeeds = 0; // Get the total first for (int step = 0; step < speedSteps; step++) { |