diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-03-11 08:46:06 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2013-03-11 08:47:39 -0700 |
| commit | accec86ce4fc49f1c8031ea7422156195e20c286 (patch) | |
| tree | dc67ddaa27a166f0bec891d40f2e1c5c40dc3c38 /wifi | |
| parent | 652b79153f78033494bd6c77e3418cefff2ff48a (diff) | |
| download | frameworks_base-accec86ce4fc49f1c8031ea7422156195e20c286.zip frameworks_base-accec86ce4fc49f1c8031ea7422156195e20c286.tar.gz frameworks_base-accec86ce4fc49f1c8031ea7422156195e20c286.tar.bz2 | |
Fix reconnect/reassociate handling
We are dropping incorrectly when in disconnected state
Bug: 8357624
Change-Id: I8919dcd679da6b5fc6c7f671e243f08e42b91ff3
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 11 |
1 files changed, 8 insertions, 3 deletions
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; |