From a66c0ab094159a4a56d183d291ccf9c88c7ac757 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 18 Dec 2012 17:06:23 -0800
Subject: [PATCH] Fix metered SSID matching regression.

WifiInfo changed to return SSIDs with quotes included, so relax our
identity matching to accept matches regardless of quotedness.

Bug: 7695807
Change-Id: I53c0361f9e44b4d47ec8764991a3cd545c253edd
---
 src/com/android/settings/net/DataUsageMeteredSettings.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index ad12311c2b9..15fda969d05 100644
--- a/src/com/android/settings/net/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -101,10 +101,10 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment {
     }
 
     private Preference buildWifiPref(Context context, WifiConfiguration config) {
-        final String networkId = removeDoubleQuotes(config.SSID);
+        final String networkId = config.SSID;
         final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
         final MeteredPreference pref = new MeteredPreference(context, template);
-        pref.setTitle(networkId);
+        pref.setTitle(removeDoubleQuotes(networkId));
         return pref;
     }