diff options
| author | Rebecca Silberstein <silberst@google.com> | 2016-07-27 18:47:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-27 18:47:29 +0000 |
| commit | 800e83d2e78ebc96e0fbc69eed6cfe489ff7fec0 (patch) | |
| tree | 88d574213ee35597911af1b481ec8eb1cc0174e5 /service/java/com/android | |
| parent | 83fc97d72a76fc522b774e79ad871b951560d33a (diff) | |
| parent | fd21a7601142e03b4c93e7d1349e900cfc0a36fe (diff) | |
| download | android_frameworks_opt_net_wifi-800e83d2e78ebc96e0fbc69eed6cfe489ff7fec0.tar.gz android_frameworks_opt_net_wifi-800e83d2e78ebc96e0fbc69eed6cfe489ff7fec0.tar.bz2 android_frameworks_opt_net_wifi-800e83d2e78ebc96e0fbc69eed6cfe489ff7fec0.zip | |
Merge "WifiStateMachine: ignore disconnect" into nyc-mr1-dev
Diffstat (limited to 'service/java/com/android')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index ab9142020..e2d1766a9 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5672,12 +5672,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss replyToMessage(message, message.what, mWifiConfigManager.getMatchingConfig((ScanResult)message.obj)); break; - /* Do a redundant disconnect without transition */ - case CMD_DISCONNECT: - mWifiConfigManager.setAndEnableLastSelectedConfiguration - (WifiConfiguration.INVALID_NETWORK_ID); - mWifiNative.disconnect(); - break; case CMD_RECONNECT: if (mWifiConnectivityManager != null) { mWifiConnectivityManager.forceConnectivityScan(); @@ -7359,6 +7353,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss case CMD_START_SCAN: deferMessage(message); return HANDLED; + case CMD_DISCONNECT: + if (DBG) log("Ignore CMD_DISCONNECT when already disconnecting."); + break; case CMD_DISCONNECTING_WATCHDOG_TIMER: if (disconnectingWatchdogCount == message.arg1) { if (DBG) log("disconnecting watchdog! -> disconnect"); @@ -7459,7 +7456,10 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss setAndEnableLastSelectedConfiguration( WifiConfiguration.INVALID_NETWORK_ID); break; - /* Ignore network disconnect */ + case CMD_DISCONNECT: + if (DBG) log("Ignore CMD_DISCONNECT when already disconnected."); + break; + /* Ignore network disconnect */ case WifiMonitor.NETWORK_DISCONNECTION_EVENT: // Interpret this as an L2 connection failure break; |