commit e0fc1875492cf1e59fe3ae4e0b1a5020672962bb
author Robert Greenwalt <rgreenwalt@google.com> Mon May 20 09:44:42 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 20 09:44:42 2013 -0700
tree c2c149f4a7057eda7cd9d610e8d050ceb8476828
parent 30dbdfff1bc20fd0337714f7ff0b94dca061b9a2
parent dfbf9901b4c16c6f7658d3e8bdb1573886c927e4

am dfbf9901: am 5c11e8ee: Fix off-by-1 error in timing

* commit 'dfbf9901b4c16c6f7658d3e8bdb1573886c927e4':
  Fix off-by-1 error in timing

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;
             }