commit 062e66cb15c856f840ea0806bcf90848c35baa4f
author Adam Lesinski <adamlesinski@google.com> Tue Jul 14 12:02:44 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Tue Jul 14 20:27:20 2015 +0000
tree 73eaa5fb2d8fc4a71aef696c509f615fe26dceb5
parent 58295e71d293c131508d280f1373d94716348b2e

BatteryStats: Fix units in wakelock distribution calculation

This is mostly for checkin stats, this is not used in any computation.

Bug:22468534
Bug:22391540
Change-Id: Ib3d0c86db5044092d3d76acf8f001337272af2ff

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

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 84c2417..ae2cbad 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -8073,7 +8073,7 @@
                     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 @@
                 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);
             }
         }