commit c9699994aa11b34b55b6321f19e8421fbcc84919
author Robert Greenwalt <rgreenwalt@google.com> Mon May 20 09:28:08 2013 -0700
committer The Android Automerger <android-build@android.com> Mon May 20 17:10:49 2013 -0700
tree 913874135d823ca0b05f40e0f1933de5b4bc4e05
parent 1f3fa2cfeb92fd298638212fc27cfcd5f8093619

Fix off-by-1 error in timing

If deferred action msg was delivered promptly it would end up
looking like it too needed to be deferred and then nothing
would end up getting done.

bug:9014777
Change-Id: I243df70463ebb9333efd6df510f71f9d8d9bdf91

services/java/com/android/server/wifi/WifiController.java

diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java
index 10f7f5a..8e2bdaa 100644
--- a/services/java/com/android/server/wifi/WifiController.java
+++ b/services/java/com/android/server/wifi/WifiController.java
@@ -426,7 +426,7 @@
 
         private boolean doDeferEnable(Message msg) {
             long delaySoFar = SystemClock.elapsedRealtime() - mDisabledTimestamp;
-            if (delaySoFar > mReEnableDelayMillis) {
+            if (delaySoFar >= mReEnableDelayMillis) {
                 return false;
             }
 
@@ -550,7 +550,7 @@
 
         private boolean doDeferEnable(Message msg) {
             long delaySoFar = SystemClock.elapsedRealtime() - mDisabledTimestamp;
-            if (delaySoFar > mReEnableDelayMillis) {
+            if (delaySoFar >= mReEnableDelayMillis) {
                 return false;
             }