From 7e85a6f8c6a0277a0eda70027ca383787ac3117d Mon Sep 17 00:00:00 2001
From: Evan Millar <>
Date: Sat, 18 Apr 2009 12:26:34 -0700
Subject: [PATCH] AI 146853: Add kernel wakelock data to batteryinfo dump.  
 BUG=1755458

Automated import of CL 146853
---
 .../android/settings/battery_history/BatteryHistory.java  | 8 ++++----
 1 file 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 ad6479aff1e..06f38ae052d 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);
                     }
                 }
             }