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

* commit '5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
  Allow extra slop in battery stats
This commit is contained in:
Todd Kennedy
2015-08-26 00:35:42 +00:00
committed by Android Git Automerger

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);
}
// There is some accuracy error in reports so allow 30 milliseconds of error.
final long SAMPLE_ERROR_MILLIS = 30;
// There is some accuracy error in reports so allow some slop in the results.
final long SAMPLE_ERROR_MILLIS = 750;
final long totalTimeMs = result.mControllerIdleTimeMs + result.mControllerRxTimeMs +
result.mControllerTxTimeMs;
if (totalTimeMs > timePeriodMs + SAMPLE_ERROR_MILLIS) {