commit 5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb
author Todd Kennedy <toddke@google.com> Wed Aug 26 00:27:46 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 26 00:27:46 2015 +0000
tree 9bbe66b1c53076e5786fb82c1f3ba77642fc758f
parent e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc
parent 590da11a85d6e5201f3a96be7d30950e4b9178e5

Merge "Allow extra slop in battery stats" into mnc-dev

services/core/java/com/android/server/am/BatteryStatsService.java

diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 9bf4f5f..335288d 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -1263,8 +1263,8 @@
                     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) {