From accec86ce4fc49f1c8031ea7422156195e20c286 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Mon, 11 Mar 2013 08:46:06 -0700 Subject: Fix reconnect/reassociate handling We are dropping incorrectly when in disconnected state Bug: 8357624 Change-Id: I8919dcd679da6b5fc6c7f671e243f08e42b91ff3 --- wifi/java/android/net/wifi/WifiStateMachine.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'wifi') diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index d4ec289..ed5d22c 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3319,9 +3319,14 @@ public class WifiStateMachine extends StateMachine { } case CMD_RECONNECT: case CMD_REASSOCIATE: - // Drop a third party reconnect/reassociate if we are - // tempoarily disconnected for p2p - if (mTemporarilyDisconnectWifi) ret = NOT_HANDLED; + if (mTemporarilyDisconnectWifi) { + // Drop a third party reconnect/reassociate if STA is + // temporarily disconnected for p2p + break; + } else { + // ConnectModeState handles it + ret = NOT_HANDLED; + } break; default: ret = NOT_HANDLED; -- cgit v1.1