diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-12-16 07:43:58 -0800 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2010-12-16 07:45:58 -0800 |
| commit | 58938159ec378670ea784d07aa13ac47f4730cbb (patch) | |
| tree | 9de871a6af5b8c251df6b4c497d817c58e2d0c18 | |
| parent | 3a65de795d5bf8f575a38a2ad83d5e3e234ae4a6 (diff) | |
| download | frameworks_base-58938159ec378670ea784d07aa13ac47f4730cbb.zip frameworks_base-58938159ec378670ea784d07aa13ac47f4730cbb.tar.gz frameworks_base-58938159ec378670ea784d07aa13ac47f4730cbb.tar.bz2 | |
Fix ssid storage regression
I introduced a bug with change Ic12fd78f. Quite
possibly a copy-paste issue.
Bug: 3281928
Change-Id: I040fa8580c3d6d5c585d0e5cc4306daab2f44c3d
| -rw-r--r-- | core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/unit/WifiClientTest.java | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfigStore.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/unit/WifiClientTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/unit/WifiClientTest.java index 6717bda..e0a3ee6 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/unit/WifiClientTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/unit/WifiClientTest.java @@ -77,7 +77,7 @@ public class WifiClientTest extends AndroidTestCase { List<WifiConfiguration> configList = mWifiManager.getConfiguredNetworks(); boolean found = false; for (WifiConfiguration c : configList) { - if (c.networkId == netId) { + if (c.networkId == netId && c.SSID.equals(config.SSID)) { found = true; } } diff --git a/wifi/java/android/net/wifi/WifiConfigStore.java b/wifi/java/android/net/wifi/WifiConfigStore.java index f597934..e650b87 100644 --- a/wifi/java/android/net/wifi/WifiConfigStore.java +++ b/wifi/java/android/net/wifi/WifiConfigStore.java @@ -1112,7 +1112,7 @@ class WifiConfigStore { value = WifiNative.getNetworkVariableCommand(netId, WifiConfiguration.ssidVarName); if (!TextUtils.isEmpty(value)) { - config.SSID = removeDoubleQuotes(value); + config.SSID = value; } else { config.SSID = null; } |