diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-05 05:50:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-05 05:50:22 +0000 |
| commit | 87d7badd662aa84369b2b9893e990cb24197ad24 (patch) | |
| tree | 118004ced9b8ee5072388841d086c177338b4d99 | |
| parent | 83e8a7ab59dc750f630bdd96a8e4773e4ca984ba (diff) | |
| parent | 98842059a66adb61a1f27fd56d92c80a77066e83 (diff) | |
| download | android_frameworks_opt_net_wifi-87d7badd662aa84369b2b9893e990cb24197ad24.tar.gz android_frameworks_opt_net_wifi-87d7badd662aa84369b2b9893e990cb24197ad24.tar.bz2 android_frameworks_opt_net_wifi-87d7badd662aa84369b2b9893e990cb24197ad24.zip | |
Merge "Do not trigger scan for reconnect() when wifi is connected" into oc-mr1-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 5 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java | 29 |
2 files changed, 34 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index bc1427891..ac7d748bb 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5997,6 +5997,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss case CMD_STOP_RSSI_MONITORING_OFFLOAD: stopRssiMonitoringOffload(); break; + case CMD_RECONNECT: + log(" Ignore CMD_RECONNECT request because wifi is already connected"); + break; case CMD_RESET_SIM_NETWORKS: if (message.arg1 == 0 // sim was removed && mLastNetworkId != WifiConfiguration.INVALID_NETWORK_ID) { @@ -6849,6 +6852,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss case WifiManager.CONNECT_NETWORK: case CMD_ENABLE_NETWORK: case CMD_RECONNECT: + log(" Ignore CMD_RECONNECT request because wps is running"); + return HANDLED; case CMD_REASSOCIATE: deferMessage(message); break; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java index 8f67df491..69e6070ed 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java @@ -2354,6 +2354,35 @@ public class WifiStateMachineTest { } /** + * Test that reconnectCommand() triggers connectivity scan when WifiStateMachine + * is in DisconnectedMode. + */ + @Test + public void testReconnectCommandWhenDisconnected() throws Exception { + // Connect to network with |sBSSID|, |sFreq|, and then disconnect. + disconnect(); + + mWsm.reconnectCommand(WifiStateMachine.WIFI_WORK_SOURCE); + mLooper.dispatchAll(); + verify(mWifiConnectivityManager).forceConnectivityScan(WifiStateMachine.WIFI_WORK_SOURCE); + } + + /** + * Test that reconnectCommand() doesn't trigger connectivity scan when WifiStateMachine + * is in ConnectedMode. + */ + @Test + public void testReconnectCommandWhenConnected() throws Exception { + // Connect to network with |sBSSID|, |sFreq|. + connect(); + + mWsm.reconnectCommand(WifiStateMachine.WIFI_WORK_SOURCE); + mLooper.dispatchAll(); + verify(mWifiConnectivityManager, never()) + .forceConnectivityScan(WifiStateMachine.WIFI_WORK_SOURCE); + } + + /** * Adds the network without putting WifiStateMachine into ConnectMode. */ @Test |