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

Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf

Browse Source 
Change-Id: Icd2605fd1572dd21bb27a7d42bc62ba9b06bd9ad
This commit is contained in:
Jeff Sharkey
2017-03-12 17:22:21 -06:00
parent 9ba477b62b 11324dcedf
commit 0f0e3adac8
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(WifiConfiguration config) { private Preference buildWifiPref(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(getPrefContext(), template); final MeteredPreference pref = new MeteredPreference(getPrefContext(), template);
pref.setTitle(removeDoubleQuotes(networkId)); pref.setTitle(removeDoubleQuotes(networkId));