From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 19 Dec 2012 01:06:23 +0000 (-0800)
Subject: Fix metered SSID matching regression.
X-Git-Tag: android-x86-4.4-r1~714
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a66c0ab094159a4a56d183d291ccf9c88c7ac757;p=android-x86%2Fpackages-apps-Settings.git

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

diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index ad12311c2b..15fda969d0 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;
     }