summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/net
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-12-18 17:06:23 -0800
committerJeff Sharkey <jsharkey@android.com>2012-12-18 17:06:23 -0800
commita66c0ab094159a4a56d183d291ccf9c88c7ac757 (patch)
treeb36a2733e8fa2c68e633507ce8a093d5438a3737 /src/com/android/settings/net
parent17653f566d74d3ffd4c82093c1a784a45f358381 (diff)
downloadpackages_apps_Settings-a66c0ab094159a4a56d183d291ccf9c88c7ac757.zip
packages_apps_Settings-a66c0ab094159a4a56d183d291ccf9c88c7ac757.tar.gz
packages_apps_Settings-a66c0ab094159a4a56d183d291ccf9c88c7ac757.tar.bz2
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
Diffstat (limited to 'src/com/android/settings/net')
-rw-r--r--src/com/android/settings/net/DataUsageMeteredSettings.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index ad12311..15fda96 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;
}