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

am 388e6854: am 81d0325f: am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev

Browse Source 
* commit '388e6854469f4755d763ade46a1915bdb3f93c25':
  Allow extra slop in battery stats
This commit is contained in:
Todd Kennedy
2015-08-26 00:48:43 +00:00
committed by Android Git Automerger
parent 8d662a0742 388e685446
commit 742184528b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -1263,8 +1263,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub
Slog.v(TAG, "WiFi energy data was reset, new WiFi energy data is " + result); Slog.v(TAG, "WiFi energy data was reset, new WiFi energy data is " + result);
} }
// There is some accuracy error in reports so allow 30 milliseconds of error. // There is some accuracy error in reports so allow some slop in the results.
final long SAMPLE_ERROR_MILLIS = 30; final long SAMPLE_ERROR_MILLIS = 750;
final long totalTimeMs = result.mControllerIdleTimeMs + result.mControllerRxTimeMs + final long totalTimeMs = result.mControllerIdleTimeMs + result.mControllerRxTimeMs +
result.mControllerTxTimeMs; result.mControllerTxTimeMs;
if (totalTimeMs > timePeriodMs + SAMPLE_ERROR_MILLIS) { if (totalTimeMs > timePeriodMs + SAMPLE_ERROR_MILLIS) {