PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev am: 7eeca4b052

Browse Source 
am: d8895787c9

Change-Id: I4a8f9ed8661f9af6105456c3a0d681373768dc40
This commit is contained in:
Peter Qiu
2017-06-02 20:45:36 +00:00
committed by android-build-merger
parent fbeab35a25 d8895787c9
commit feba9f5dac
1 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
View File

@@ -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){