From 5ff384b55c540eff2cc252de13a52118f2e6213f Mon Sep 17 00:00:00 2001
From: Wuchen Li <wuchen.x.li@sonymobile.com>
Date: Fri, 29 Jan 2016 15:23:33 +0800
Subject: [PATCH] Fix network name for Passpoint network

Metered network settings (Settings -> Data Usage -> Network Restrictions)
show different network name for passpoint networks than saved networks
(Settings -> Wi-Fi). This is because it shows only SSID for all networks
which for passpoint networks may be different than provider friendly name.

It should instead show AccessPoint#getConfigName as displayed in the
list of saved networks.

Bug: 32964588
Change-Id: I91d25ed24e7b7f5cc9c67680d0009ed64e75bb8a
---
 .../android/settings/datausage/DataUsageMeteredSettings.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index eb43d47fda9..7a397ad3155 100644
--- 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));