From ce49acad1031b31ac2d73fd85e63a1808229c611 Mon Sep 17 00:00:00 2001 From: Bookatz Date: Mon, 3 Apr 2017 09:47:05 -0700 Subject: [PATCH] Change wifiScanActualTime csv from usec to msec The wifi scan actual time is desired (in the batterystats.proto) to be in msec instead of usec. It makes more sense to therefore output the value in msec rather than convert it when it gets read into the proto. Bug: 35677312 Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java Change-Id: I22fce69b6faecd00f79837369344e04b426a1c33 --- core/java/android/os/BatteryStats.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index dd11f68ffe509..51df9c14c1027 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -3303,16 +3303,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,