commit 11324dcedfd9d4cccba0b1e493c44fe80bb05da4
author Jeff Sharkey <jsharkey@android.com> Sun Mar 12 23:13:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Mar 12 23:13:42 2017 +0000
tree 809359a0c2808290c685e9617a3efc7b93626581
parent dd48f602bbbe7d87eedf59a9ee967c2577da08a9
parent a41debeacd9d88e8d620491243808ba111a065ad

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

Change-Id: I6cffc06b4d792501fd3cc158cbc119b3c388c9be

src/com/android/settings/datausage/DataUsageMeteredSettings.java

diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index eb43d47..7a397ad 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -114,7 +114,8 @@
     }
 
     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));