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

Merge "Fix network name for Passpoint network" am: 742bd03f12

Browse Source 
am: a41debeacd

Change-Id: I6cffc06b4d792501fd3cc158cbc119b3c388c9be
This commit is contained in:
Jeff Sharkey
2017-03-12 23:13:42 +00:00
committed by android-build-merger
parent dd48f602bb a41debeacd
commit 11324dcedf
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));