From c68b46c1f22e1679b3b4a31c20c7951ca1f119f0 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 15 Jun 2015 10:08:40 -0400 Subject: Handle switch of ssid to CharSequence (for spans) Change to reference the string directly for places like search, etc. Bug: 20059794 Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e --- src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java | 2 +- src/com/android/settings/wifi/WifiConfigController.java | 2 +- src/com/android/settings/wifi/WifiSettings.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/com/android/settings/wifi') diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 2d200b5..9a88ee8 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -216,7 +216,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment final int accessPointsSize = accessPoints.size(); for (int i = 0; i < accessPointsSize; ++i){ data = new SearchIndexableRaw(context); - data.title = accessPoints.get(i).getSsid(); + data.title = accessPoints.get(i).getSsidStr(); data.screenTitle = title; data.enabled = enabled; result.add(data); diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 1671c02..1742c16 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -382,7 +382,7 @@ public class WifiConfigController implements TextWatcher, config.hiddenSSID = true; } else if (!mAccessPoint.isSaved()) { config.SSID = AccessPoint.convertToQuotedString( - mAccessPoint.getSsid()); + mAccessPoint.getSsidStr()); } else { config.networkId = mAccessPoint.getConfig().networkId; } diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 6b9fc2f..fed8fd8 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -820,7 +820,7 @@ public class WifiSettings extends RestrictedSettingsFragment mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) { // Network is active but has no network ID - must be ephemeral. mWifiManager.disableEphemeralNetwork( - AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid())); + AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsidStr())); } else { // Should not happen, but a monkey seems to trigger it Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig()); @@ -922,7 +922,7 @@ public class WifiSettings extends RestrictedSettingsFragment WifiTracker.getCurrentAccessPoints(context, true, false, false); for (AccessPoint accessPoint : accessPoints) { data = new SearchIndexableRaw(context); - data.title = accessPoint.getSsid(); + data.title = accessPoint.getSsidStr(); data.screenTitle = res.getString(R.string.wifi_settings); data.enabled = enabled; result.add(data); -- cgit v1.1