commit a41debeacd9d88e8d620491243808ba111a065ad
author Jeff Sharkey <jsharkey@android.com> Sun Mar 12 23:09:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Mar 12 23:09:11 2017 +0000
tree 189db542342fa502a3941494580e868d323c34d8
parent 015fe72cd38928bc78238280202dc0679001360f
parent 742bd03f1268bbb6c386ec9bf6b0010547300673

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

Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2

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));