From fa6c7111fe58e09a92741c7655221c3629d3220e Mon Sep 17 00:00:00 2001 From: San Mehat Date: Tue, 7 Jul 2009 09:34:44 -0700 Subject: WifiService: use wifi association state to determine if we should suspend wifi instead of the existance of an IP address. Signed-off-by: San Mehat --- services/java/com/android/server/WifiService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index e2aee4217255..5cbe7f3c4b20 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -1569,8 +1569,9 @@ public class WifiService extends IWifiManager.Stub { * or plugged in to AC). */ if (!shouldWifiStayAwake(stayAwakeConditions, mPluggedType)) { - if (!mWifiStateTracker.hasIpAddress()) { - // do not keep Wifi awake when screen is off if Wifi is not fully active + WifiInfo info = mWifiStateTracker.requestConnectionInfo(); + if (info.getSupplicantState() != SupplicantState.COMPLETED) { + // do not keep Wifi awake when screen is off if Wifi is not associated mDeviceIdle = true; updateWifiState(); } else { -- cgit v1.2.3-59-g8ed1b