Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo

Author: Chung-yih Wang

services/java/com/android/server/WifiService.java

@@ -872,7 +872,7 @@ private void readNetworkVariables(WifiConfiguration config) {
 
         value = mWifiStateTracker.getNetworkVariable(netId, WifiConfiguration.ssidVarName);
         if (!TextUtils.isEmpty(value)) {
-            config.SSID = removeDoubleQuotes(value);
+            config.SSID = value;
         } else {
             config.SSID = null;
         }
@@ -1062,7 +1062,7 @@ public int addOrUpdateNetwork(WifiConfiguration config) {
                     !mWifiStateTracker.setNetworkVariable(
                         netId,
                         WifiConfiguration.ssidVarName,
-                        convertToQuotedString(config.SSID))) {
+                        config.SSID)) {
                 if (DBG) {
                     Slog.d(TAG, "failed to set SSID: "+config.SSID);
                 }