summaryrefslogtreecommitdiffstats
path: root/service/java/com/android
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2019-05-14 14:52:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-14 14:52:01 +0000
commit53feab9d72b0213982722cc861dbcbd16b4f40ee (patch)
treeaa2781ccaa760432bd8b7b35a574ecdfea6cd87c /service/java/com/android
parent2799685d3f49cb74c0ed7353ce6d677908cc6fdd (diff)
parent81468eeebdf860cce461ed595725598bc608cadb (diff)
downloadandroid_frameworks_opt_net_wifi-53feab9d72b0213982722cc861dbcbd16b4f40ee.tar.gz
android_frameworks_opt_net_wifi-53feab9d72b0213982722cc861dbcbd16b4f40ee.tar.bz2
android_frameworks_opt_net_wifi-53feab9d72b0213982722cc861dbcbd16b4f40ee.zip
Merge "WifiNetworkFactory: Handle request for connection to current network" into qt-dev
Diffstat (limited to 'service/java/com/android')
-rw-r--r--service/java/com/android/server/wifi/WifiNetworkFactory.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java
index 168200bd5..65d78e6aa 100644
--- a/service/java/com/android/server/wifi/WifiNetworkFactory.java
+++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java
@@ -749,6 +749,8 @@ public class WifiNetworkFactory extends NetworkFactory {
// Store the user selected network.
mUserSelectedNetwork = networkToConnect;
+ // Disconnect from the current network before issuing a new connect request.
+ mWifiInjector.getClientModeImpl().disconnectCommand();
// Trigger connection to the network.
connectToNetwork(networkToConnect);
// Triggered connection to network, now wait for the connection status.