Merge "Fix reconnect/reassociate handling" into jb-mr2-dev

2013-03-11 18:19:32 +00:00
parent de96589113 accec86ce4
commit 1f9806a41d
1 changed files with 8 additions and 3 deletions
--- 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;