Merge "Wifi: send an explicit ENABLE_NETWORK with "no-connect"" into mm-wireless-dev

am: e5da466fd5

* commit 'e5da466fd5d9d8024780590ee8b1c335889443a7':
  Wifi: send an explicit ENABLE_NETWORK with "no-connect"

2 files changed, 11 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 73ccd3b26..431ca2ca8 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -910,7 +910,7 @@ public class WifiConfigStore {
             return false;
         }
         if (VDBG) localLog("enableNetwork: " + config.networkId);
-        if (!mWifiNative.enableNetwork(config.networkId)) {
+        if (!mWifiNative.enableNetworkWithoutConnect(config.networkId)) {
             loge("Enable network in wpa_supplicant failed on " + config.networkId);
             return false;
         }
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 9cd9235fe..c3afa3899 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -487,6 +487,16 @@ public class WifiNative {
     }
 
     /**
+     * Enable a network in wpa_supplicant, do not connect.
+     * @param netId - Network ID of the network to be enabled.
+     * @return true if command succeeded, false otherwise.
+     */
+    public boolean enableNetworkWithoutConnect(int netId) {
+        if (DBG) logDbg("enableNetworkWithoutConnect nid=" + Integer.toString(netId));
+        return doBooleanCommand("ENABLE_NETWORK " + netId + " " + "no-connect");
+    }
+
+    /**
      * Disables a network in wpa_supplicant.
      * @param netId - Network ID of the network to be disabled.
      * @return true if command succeeded, false otherwise.