From 1fcb026a3ab8d5339e0964e9375554e71fca854d Mon Sep 17 00:00:00 2001
From: Peter Qiu <zqiu@google.com>
Date: Wed, 31 May 2017 10:19:42 -0700
Subject: [PATCH] wifi: use WifiSavedConfigUtils to retrieve saved
 configurations

Bug: 62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
---
 .../wifi/SavedAccessPointsWifiSettings.java   | 42 +++----------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 1a60256cce0..bf67565ea94 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -38,7 +38,7 @@ import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPointPreference;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiSavedConfigUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -124,7 +124,8 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
         PreferenceScreen preferenceScreen = getPreferenceScreen();
         final Context context = getPrefContext();
 
-        final List<AccessPoint> accessPoints = getSavedConfigs(context, mWifiManager);
+        final List<AccessPoint> accessPoints =
+                WifiSavedConfigUtils.getAllConfigs(context, mWifiManager);
         Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);
         preferenceScreen.removeAll();
 
@@ -142,39 +143,6 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
         }
     }
 
-    /**
-     * Retrieved the list of saved network configurations from {@link WifiManager}.
-     * Each configuration is represented by {@link AccessPoint}.
-     *
-     * @param context The application context
-     * @param wifiManager An instance of {@link WifiManager}
-     * @return List of {@link AccessPoint}
-     */
-    private static List<AccessPoint> getSavedConfigs(Context context, WifiManager wifiManager) {
-        List<AccessPoint> savedConfigs = new ArrayList<>();
-        List<WifiConfiguration> savedNetworks = wifiManager.getConfiguredNetworks();
-        for (WifiConfiguration network : savedNetworks) {
-            // Configuration for Passpoint network is configured temporary by WifiService for
-            // connection attempt only.  The underlying configuration is saved as Passpoint
-            // configuration, which will be retrieved with WifiManager#getPasspointConfiguration
-            // call below.
-            if (network.isPasspoint()) {
-                continue;
-            }
-            savedConfigs.add(new AccessPoint(context, network));
-        }
-        try {
-            List<PasspointConfiguration> savedPasspointConfigs =
-                    wifiManager.getPasspointConfigurations();
-            for (PasspointConfiguration config : savedPasspointConfigs) {
-                savedConfigs.add(new AccessPoint(context, config));
-            }
-        } catch (UnsupportedOperationException e) {
-            // Passpoint not supported.
-        }
-        return savedConfigs;
-    }
-
     private void showDialog(LongPressAccessPointPreference accessPoint, boolean edit) {
         if (mDialog != null) {
             removeDialog(WifiSettings.WIFI_DIALOG_ID);
@@ -292,8 +260,8 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
                 result.add(data);
 
                 // Add available Wi-Fi access points
-                final List<AccessPoint> accessPoints =
-                        getSavedConfigs(context, context.getSystemService(WifiManager.class));
+                final List<AccessPoint> accessPoints = WifiSavedConfigUtils.getAllConfigs(
+                        context, context.getSystemService(WifiManager.class));
 
                 final int accessPointsSize = accessPoints.size();
                 for (int i = 0; i < accessPointsSize; ++i){