commit 0f0e3adac8bf23f81f045bd16393095d59d35325
author Jeff Sharkey <jsharkey@android.com> Sun Mar 12 17:22:21 2017 -0600
committer Jeff Sharkey <jsharkey@android.com> Sun Mar 12 17:22:21 2017 -0600
tree 4de03464d7c4fd42ec8230679f6ab6862b36b4c6
parent 9ba477b62bfd4a6488480bc09ed91ad52859afa2
parent 11324dcedfd9d4cccba0b1e493c44fe80bb05da4

Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf

Change-Id: Icd2605fd1572dd21bb27a7d42bc62ba9b06bd9ad

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 1982887..ce2bc8d 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -114,7 +114,8 @@
     }
 
     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 MeteredPreference pref = new MeteredPreference(getPrefContext(), template);
         pref.setTitle(removeDoubleQuotes(networkId));