Do not remove and add the same network

This patch allows SupplicantStatIfaceHal to skip the "remove
and add" process for supplicant network if there is already
the same network saved in supplicant.

This will be helpful when phone reconnects to a EAP-SIM
network. In that case, EAP state parameters will not be cleared by
removing network, so supplicant can take advantage of those
parameters for fast-reauth.

Bug: 37529849
Test: compile. unit test, integration test, manual test

Change-Id: I4326e9f60f4f8a64674a52d1dbbcd34c5e709064

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java
index 917a64cc9..b53732a91 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java
@@ -241,6 +241,15 @@ public class WifiConfigurationTestUtil {
         return configuration;
     }
 
+    public static WifiConfiguration createPskNetwork(String ssid) {
+        WifiConfiguration configuration =
+                generateWifiConfig(TEST_NETWORK_ID, TEST_UID, ssid, true, true, null,
+                        null, SECURITY_PSK);
+        configuration.preSharedKey = TEST_PSK;
+        return configuration;
+    }
+
+
     public static WifiConfiguration createPskHiddenNetwork() {
         WifiConfiguration configuration = createPskNetwork();
         configuration.hiddenSSID = true;
@@ -280,6 +289,14 @@ public class WifiConfigurationTestUtil {
         return configuration;
     }
 
+    public static WifiConfiguration createEapNetwork(String ssid) {
+        WifiConfiguration configuration =
+                generateWifiConfig(TEST_NETWORK_ID, TEST_UID, ssid, true, true,
+                        null, null, SECURITY_EAP);
+        return configuration;
+    }
+
+
     public static WifiConfiguration createEapNetwork(int eapMethod, int phase2Method) {
         WifiConfiguration configuration =
                 generateWifiConfig(TEST_NETWORK_ID, TEST_UID, createNewSSID(), true, true,