Remove loadNetworks from supplicant

It was used to migrate the legacy networks config from supplicant.
WifiConfigStoreLegacy was removed, this is not needed any more.

Bug: 140062548
Test: build and unit test

Change-Id: Ic1a356e0969bde7fd1a3e7c2378634748f3a9607

3 files changed, 1 insertions, 74 deletions

diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
index 00c90c87a..75aef2a82 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
@@ -47,7 +47,6 @@ import android.hardware.wifi.supplicant.V1_2.DppAkm;
 import android.hardware.wifi.supplicant.V1_2.DppFailureCode;
 import android.hidl.manager.V1_0.IServiceManager;
 import android.hidl.manager.V1_0.IServiceNotification;
-import android.net.IpConfiguration;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
@@ -62,7 +61,6 @@ import android.util.Log;
 import android.util.MutableBoolean;
 import android.util.MutableInt;
 import android.util.Pair;
-import android.util.SparseArray;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.server.wifi.WifiNative.DppEventCallback;
@@ -81,7 +79,6 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
@@ -931,61 +928,6 @@ public class SupplicantStaIfaceHal {
     }
 
     /**
-     * Load all the configured networks from wpa_supplicant.
-     *
-     * @param ifaceName     Name of the interface.
-     * @param configs       Map of configuration key to configuration objects corresponding to all
-     *                      the networks.
-     * @param networkExtras Map of extra configuration parameters stored in wpa_supplicant.conf
-     * @return true if succeeds, false otherwise.
-     */
-    public boolean loadNetworks(@NonNull String ifaceName, Map<String, WifiConfiguration> configs,
-                                SparseArray<Map<String, String>> networkExtras) {
-        synchronized (mLock) {
-            List<Integer> networkIds = listNetworks(ifaceName);
-            if (networkIds == null) {
-                Log.e(TAG, "Failed to list networks");
-                return false;
-            }
-            for (Integer networkId : networkIds) {
-                SupplicantStaNetworkHal network = getNetwork(ifaceName, networkId);
-                if (network == null) {
-                    Log.e(TAG, "Failed to get network with ID: " + networkId);
-                    return false;
-                }
-                WifiConfiguration config = new WifiConfiguration();
-                Map<String, String> networkExtra = new HashMap<>();
-                boolean loadSuccess = false;
-                try {
-                    loadSuccess = network.loadWifiConfiguration(config, networkExtra);
-                } catch (IllegalArgumentException e) {
-                    Log.wtf(TAG, "Exception while loading config params: " + config, e);
-                }
-                if (!loadSuccess) {
-                    Log.e(TAG, "Failed to load wifi configuration for network with ID: " + networkId
-                            + ". Skipping...");
-                    continue;
-                }
-                // Set the default IP assignments.
-                config.setIpAssignment(IpConfiguration.IpAssignment.DHCP);
-                config.setProxySettings(IpConfiguration.ProxySettings.NONE);
-
-                networkExtras.put(networkId, networkExtra);
-                String configKey =
-                        networkExtra.get(SupplicantStaNetworkHal.ID_STRING_KEY_CONFIG_KEY);
-                final WifiConfiguration duplicateConfig = configs.put(configKey, config);
-                if (duplicateConfig != null) {
-                    // The network is already known. Overwrite the duplicate entry.
-                    Log.i(TAG, "Replacing duplicate network: " + duplicateConfig.networkId);
-                    removeNetwork(ifaceName, duplicateConfig.networkId);
-                    networkExtras.remove(duplicateConfig.networkId);
-                }
-            }
-            return true;
-        }
-    }
-
-    /**
      * Remove the request |networkId| from supplicant if it's the current network,
      * if the current configured network matches |networkId|.
      *
diff --git a/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java b/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java
index 9255fc231..83d31ff64 100644
--- a/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java
+++ b/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java
@@ -159,6 +159,7 @@ public class SupplicantStaNetworkHal {
      * @return true if succeeds, false otherwise.
      * @throws IllegalArgumentException on malformed configuration params.
      */
+    @VisibleForTesting
     public boolean loadWifiConfiguration(WifiConfiguration config,
             Map<String, String> networkExtras) {
         synchronized (mLock) {
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 3078d0b05..b24572626 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -31,7 +31,6 @@ import android.os.RemoteException;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.SparseArray;
 
 import com.android.internal.annotations.Immutable;
 import com.android.internal.util.HexDump;
@@ -2089,21 +2088,6 @@ public class WifiNative {
     }
 
     /**
-     * Migrate all the configured networks from wpa_supplicant.
-     *
-     * @param ifaceName Name of the interface.
-     * @param configs       Map of configuration key to configuration objects corresponding to all
-     *                      the networks.
-     * @param networkExtras Map of extra configuration parameters stored in wpa_supplicant.conf
-     * @return Max priority of all the configs.
-     */
-    public boolean migrateNetworksFromSupplicant(
-            @NonNull String ifaceName, Map<String, WifiConfiguration> configs,
-            SparseArray<Map<String, String>> networkExtras) {
-        return mSupplicantStaIfaceHal.loadNetworks(ifaceName, configs, networkExtras);
-    }
-
-    /**
      * Add the provided network configuration to wpa_supplicant and initiate connection to it.
      * This method does the following:
      * 1. Abort any ongoing scan to unblock the connection request.