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

Fix network name for Passpoint network

Browse Source 
Metered network settings (Settings -> Data Usage -> Network Restrictions)
show different network name for passpoint networks than saved networks
(Settings -> Wi-Fi). This is because it shows only SSID for all networks
which for passpoint networks may be different than provider friendly name.

It should instead show AccessPoint#getConfigName as displayed in the
list of saved networks.

Bug: 32964588
Change-Id: I91d25ed24e7b7f5cc9c67680d0009ed64e75bb8a
This commit is contained in:
Wuchen Li
2016-01-29 15:23:33 +08:00
committed by Zoran Jovanovic
parent 917b7b863c
commit 5ff384b55c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/datausage/DataUsageMeteredSettings.java
View File

@@ -114,7 +114,8 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
} }
private Preference buildWifiPref(Context context, WifiConfiguration config) { private Preference buildWifiPref(Context context, WifiConfiguration config) {
final String networkId = config.SSID; final String networkId = config.isPasspoint() ?
config.providerFriendlyName : config.SSID;
final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId); final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
final MeteredPreference pref = new MeteredPreference(context, template); final MeteredPreference pref = new MeteredPreference(context, template);
pref.setTitle(removeDoubleQuotes(networkId)); pref.setTitle(removeDoubleQuotes(networkId));