PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'readonly-p4-donut' into donut

Browse Source
This commit is contained in:
Evan Millar
2009-04-18 12:27:52 -07:00
committed by The Android Open Source Project
parent 69720d1db3 7e85a6f8c6
commit 9aacc30ad7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/battery_history/BatteryHistory.java
View File

@@ -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);
}
}
}