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
This commit is contained in:
Jeff Sharkey
2012-12-18 17:06:23 -08:00
parent 17653f566d
commit a66c0ab094

View File

@@ -101,10 +101,10 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment {
} }
private Preference buildWifiPref(Context context, WifiConfiguration config) { 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 NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
final MeteredPreference pref = new MeteredPreference(context, template); final MeteredPreference pref = new MeteredPreference(context, template);
pref.setTitle(networkId); pref.setTitle(removeDoubleQuotes(networkId));
return pref; return pref;
} }