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

Merge "Fix in Wifi activity updates" into pi-dev

Browse Source 
am: f83e814b18

Change-Id: I7e42a65ef660029ecfc8a3bf17dac7b5beede755
This commit is contained in:
Siddharth Ray
2018-06-28 14:46:17 -07:00
committed by android-build-merger
parent 66867db010 f83e814b18
commit 742ccd759d
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/am/BatteryExternalStatsWorker.java
View File

@@ -543,14 +543,25 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
final long idleTimeMs = latest.mControllerIdleTimeMs - lastIdleMs;
final long scanTimeMs = latest.mControllerScanTimeMs - lastScanMs;
if (txTimeMs < 0 || rxTimeMs < 0 || scanTimeMs < 0) {
if (txTimeMs < 0 || rxTimeMs < 0 || scanTimeMs < 0 || idleTimeMs < 0) {
// The stats were reset by the WiFi system (which is why our delta is negative).
// Returns the unaltered stats.
delta.mControllerEnergyUsed = latest.mControllerEnergyUsed;
delta.mControllerRxTimeMs = latest.mControllerRxTimeMs;
delta.mControllerTxTimeMs = latest.mControllerTxTimeMs;
delta.mControllerIdleTimeMs = latest.mControllerIdleTimeMs;
delta.mControllerScanTimeMs = latest.mControllerScanTimeMs;
// Returns the unaltered stats. The total on time should not exceed the time
// duartion between reports.
final long totalOnTimeMs = latest.mControllerTxTimeMs + latest.mControllerRxTimeMs
+ latest.mControllerIdleTimeMs;
if (totalOnTimeMs <= timePeriodMs + MAX_WIFI_STATS_SAMPLE_ERROR_MILLIS) {
delta.mControllerEnergyUsed = latest.mControllerEnergyUsed;
delta.mControllerRxTimeMs = latest.mControllerRxTimeMs;
delta.mControllerTxTimeMs = latest.mControllerTxTimeMs;
delta.mControllerIdleTimeMs = latest.mControllerIdleTimeMs;
delta.mControllerScanTimeMs = latest.mControllerScanTimeMs;
} else {
delta.mControllerEnergyUsed = 0;
delta.mControllerRxTimeMs = 0;
delta.mControllerTxTimeMs = 0;
delta.mControllerIdleTimeMs = 0;
delta.mControllerScanTimeMs = 0;
}
Slog.v(TAG, "WiFi energy data was reset, new WiFi energy data is " + delta);
} else {
final long totalActiveTimeMs = txTimeMs + rxTimeMs;