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

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

Browse Source
This commit is contained in:
Chung-yih Wang
2010-05-14 23:20:07 -07:00
committed by Android Git Automerger
parent 36bc4be02f 533844d968
commit c7163cbf42
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); value = mWifiStateTracker.getNetworkVariable(netId, WifiConfiguration.ssidVarName);
if (!TextUtils.isEmpty(value)) { if (!TextUtils.isEmpty(value)) {
config.SSID = removeDoubleQuotes(value); config.SSID = value;
} else { } else {
config.SSID = null; config.SSID = null;
} }
@@ -1062,7 +1062,7 @@ public class WifiService extends IWifiManager.Stub {
!mWifiStateTracker.setNetworkVariable( !mWifiStateTracker.setNetworkVariable(
netId, netId,
WifiConfiguration.ssidVarName, WifiConfiguration.ssidVarName,
convertToQuotedString(config.SSID))) { config.SSID)) {
if (DBG) { if (DBG) {
Slog.d(TAG, "failed to set SSID: "+config.SSID); Slog.d(TAG, "failed to set SSID: "+config.SSID);
} }