diff options
author | Evan Millar <> | 2009-04-18 12:26:34 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-18 12:26:34 -0700 |
commit | 7e85a6f8c6a0277a0eda70027ca383787ac3117d (patch) | |
tree | 201afa93505dadd0c93b225bf6fbda085cc7efbd /src | |
parent | 1f06e4f99bab32cf7ae5f8d36b161d11846d0f8a (diff) | |
download | packages_apps_settings-7e85a6f8c6a0277a0eda70027ca383787ac3117d.zip packages_apps_settings-7e85a6f8c6a0277a0eda70027ca383787ac3117d.tar.gz packages_apps_settings-7e85a6f8c6a0277a0eda70027ca383787ac3117d.tar.bz2 |
AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=1755458
Automated import of CL 146853
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/battery_history/BatteryHistory.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/battery_history/BatteryHistory.java b/src/com/android/settings/battery_history/BatteryHistory.java index ad6479a..06f38ae 100644 --- a/src/com/android/settings/battery_history/BatteryHistory.java +++ b/src/com/android/settings/battery_history/BatteryHistory.java @@ -607,8 +607,8 @@ public class BatteryHistory extends Activity implements OnClickListener, OnItemS Timer timer = se.getSensorTime(); if (timer != null) { // Convert from microseconds to milliseconds with rounding - long totalTime = (timer.getTotalTime(uSecNow, mWhich) + 500) / 1000; - int count = timer.getCount(mWhich); + long totalTime = (timer.getTotalTimeLocked(uSecNow, mWhich) + 500) / 1000; + int count = timer.getCountLocked(mWhich); if (handle == BatteryStats.Uid.Sensor.GPS) { timeGps += totalTime; countGps += count; @@ -655,8 +655,8 @@ public class BatteryHistory extends Activity implements OnClickListener, OnItemS Timer timer = wl.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL); if (timer != null) { // Convert from microseconds to milliseconds with rounding - time += (timer.getTotalTime(uSecNow, mWhich) + 500) / 1000; - count += timer.getCount(mWhich); + time += (timer.getTotalTimeLocked(uSecNow, mWhich) + 500) / 1000; + count += timer.getCountLocked(mWhich); } } } |