Merge "Fix network name for Passpoint network"

am: 742bd03f12 Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2
2017-03-12 23:09:11 +00:00
parent 015fe72cd3 742bd03f12
commit a41debeacd
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -114,7 +114,8 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
    }

    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 MeteredPreference pref = new MeteredPreference(context, template);
        pref.setTitle(removeDoubleQuotes(networkId));