drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Ic6d1545d into eclair-mr2

Browse Source 
* changes:
  Support double-quote SSID in WifiService.
This commit is contained in:
Android (Google) Code Review
2009-10-12 21:33:04 -04:00
parent 63f20ec1a8 a8d1594139
commit cf4f2c22cb
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/java/com/android/server/WifiService.java
View File

@ -542,7 +542,7 @@ public class WifiService extends IWifiManager.Stub {
value = WifiNative.getNetworkVariableCommand(netId, WifiConfiguration.ssidVarName);
if (!TextUtils.isEmpty(value)) {
config.SSID = value;
config.SSID = removeDoubleQuotes(value);
} else {
config.SSID = null;
}
@ -675,11 +675,21 @@ public class WifiService extends IWifiManager.Stub {
value = WifiNative.getNetworkVariableCommand(netId,
field.varName());
if (!TextUtils.isEmpty(value)) {
if (field != config.eap) value = removeDoubleQuotes(value);
field.setValue(value);
}
}
}
private static String removeDoubleQuotes(String string) {
if (string.length() <= 2) return "";
return string.substring(1, string.length() - 1);
}
private static String convertToQuotedString(String string) {
return "\"" + string + "\"";
}
/**
* see {@link android.net.wifi.WifiManager#addOrUpdateNetwork(WifiConfiguration)}
* @return the supplicant-assigned identifier for the new or updated
@ -731,7 +741,7 @@ public class WifiService extends IWifiManager.Stub {
!WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.ssidVarName,
config.SSID)) {
convertToQuotedString(config.SSID))) {
if (DBG) {
Log.d(TAG, "failed to set SSID: "+config.SSID);
}
@ -894,18 +904,22 @@ public class WifiService extends IWifiManager.Stub {
: config.enterpriseFields) {
String varName = field.varName();
String value = field.value();
if ((value != null) && !WifiNative.setNetworkVariableCommand(
netId,
varName,
value)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set " + varName +
": " + value);
if (value != null) {
if (field != config.eap) {
value = convertToQuotedString(value);
}
if (!WifiNative.setNetworkVariableCommand(
netId,
varName,
value)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set " + varName +
": " + value);
}
break setVariables;
}
break setVariables;
}
}
return netId;
}