From 5c11e8ee5463b88907814e3e8716af292f90fb86 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Mon, 20 May 2013 09:28:08 -0700 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java index 10f7f5a9dcde2..8e2bdaad41c4a 100644 --- a/services/java/com/android/server/wifi/WifiController.java +++ b/services/java/com/android/server/wifi/WifiController.java @@ -426,7 +426,7 @@ class WifiController extends StateMachine { private boolean doDeferEnable(Message msg) { long delaySoFar = SystemClock.elapsedRealtime() - mDisabledTimestamp; - if (delaySoFar > mReEnableDelayMillis) { + if (delaySoFar >= mReEnableDelayMillis) { return false; } @@ -550,7 +550,7 @@ class WifiController extends StateMachine { private boolean doDeferEnable(Message msg) { long delaySoFar = SystemClock.elapsedRealtime() - mDisabledTimestamp; - if (delaySoFar > mReEnableDelayMillis) { + if (delaySoFar >= mReEnableDelayMillis) { return false; }