Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo

Browse Source 
Merge commit '5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp

* commit '5f1beda18fc7709c2e61ace33607513770faf115':
  Make the SSID field of WifiConfiguration consistent with API description.
This commit is contained in:
Chung-yih Wang
2010-05-14 23:16:31 -07:00
committed by Android Git Automerger
parent 39c31bbaf9 5f1beda18f
commit c7388e3541
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -872,7 +872,7 @@ public class WifiService extends IWifiManager.Stub {
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 class WifiService extends IWifiManager.Stub {
!mWifiStateTracker.setNetworkVariable(
netId,
WifiConfiguration.ssidVarName,
convertToQuotedString(config.SSID))) {
config.SSID)) {
if (DBG) {
Slog.d(TAG, "failed to set SSID: "+config.SSID);
}