summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2010-05-20 10:56:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-20 10:56:13 -0700
commit3716ea04d9fd59ff95bacdf6efac4ab5583e13fc (patch)
tree04a866b34d10f808c6fc18783d927d049b7c7bf4 /core
parent41a254cf1b770dded24dcdb2dab6347da6dcf8bf (diff)
parent069067963cf0117cfb4a1aef99b550b126d9ca92 (diff)
downloadframeworks_base-3716ea04d9fd59ff95bacdf6efac4ab5583e13fc.zip
frameworks_base-3716ea04d9fd59ff95bacdf6efac4ab5583e13fc.tar.gz
frameworks_base-3716ea04d9fd59ff95bacdf6efac4ab5583e13fc.tar.bz2
am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp * commit '069067963cf0117cfb4a1aef99b550b126d9ca92': If the network SSID is a string, it should be enclosed in double quotation marks.
Diffstat (limited to 'core')
-rw-r--r--core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
index 6475655..7392ad4 100644
--- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
+++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
@@ -301,7 +301,7 @@ public class ConnectivityManagerTestActivity extends Activity {
if (sr.SSID.equals(knownSSID)) {
Log.v(LOG_TAG, "found " + knownSSID + " in the scan result list");
WifiConfiguration config = new WifiConfiguration();
- config.SSID = sr.SSID;
+ config.SSID = convertToQuotedString(sr.SSID);
config.allowedKeyManagement.set(KeyMgmt.NONE);
int networkId = mWifiManager.addNetwork(config);
// Connect to network by disabling others.
@@ -387,6 +387,10 @@ public class ConnectivityManagerTestActivity extends Activity {
context.sendBroadcast(intent);
}
+ protected static String convertToQuotedString(String string) {
+ return "\"" + string + "\"";
+ }
+
@Override
protected void onDestroy() {
super.onDestroy();