Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change wifiScanActualTime csv from usec to msec" into oc-dev

Browse Source
This commit is contained in:
Adam Bookatz
2017-04-05 23:56:56 +00:00
committed by Android (Google) Code Review
parent d3ed35f690 ce49acad10
commit a63e911ad2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/os/BatteryStats.java
View File

@@ -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,