diff options
| author | 2017-04-05 23:56:56 +0000 | |
|---|---|---|
| committer | 2017-04-05 23:57:00 +0000 | |
| commit | a63e911ad24a004e34ee9c1f2083b1fc53c7f2ab (patch) | |
| tree | 28e31092b83f616b49f4650701460be88e6ef682 | |
| parent | d3ed35f690fcb488a6166e1b98dddb006e79091a (diff) | |
| parent | ce49acad1031b31ac2d73fd85e63a1808229c611 (diff) | |
Merge "Change wifiScanActualTime csv from usec to msec" into oc-dev
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 8349510a1462..4c6d22ae1c51 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -3313,16 +3313,17 @@ public abstract class BatteryStats implements Parcelable { final int wifiScanCount = u.getWifiScanCount(which); final int wifiScanCountBg = u.getWifiScanBackgroundCount(which); // Note that 'ActualTime' are unpooled and always since reset (regardless of 'which') - final long wifiScanActualTime = u.getWifiScanActualTime(rawRealtime); - final long wifiScanActualTimeBg = u.getWifiScanBackgroundTime(rawRealtime); + final long wifiScanActualTimeMs = (u.getWifiScanActualTime(rawRealtime) + 500) / 1000; + final long wifiScanActualTimeMsBg = (u.getWifiScanBackgroundTime(rawRealtime) + 500) + / 1000; final long uidWifiRunningTime = u.getWifiRunningTime(rawRealtime, which); if (fullWifiLockOnTime != 0 || wifiScanTime != 0 || wifiScanCount != 0 - || wifiScanCountBg != 0 || wifiScanActualTime != 0 || wifiScanActualTimeBg != 0 - || uidWifiRunningTime != 0) { + || wifiScanCountBg != 0 || wifiScanActualTimeMs != 0 + || wifiScanActualTimeMsBg != 0 || uidWifiRunningTime != 0) { dumpLine(pw, uid, category, WIFI_DATA, fullWifiLockOnTime, wifiScanTime, uidWifiRunningTime, wifiScanCount, /* legacy fields follow, keep at 0 */ 0, 0, 0, - wifiScanCountBg, wifiScanActualTime, wifiScanActualTimeBg); + wifiScanCountBg, wifiScanActualTimeMs, wifiScanActualTimeMsBg); } dumpControllerActivityLine(pw, uid, category, WIFI_CONTROLLER_DATA, |