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

resolved conflicts for merge of 52556689 to gingerbread-plus-aosp

Browse Source 
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
This commit is contained in:
Irfan Sheriff
2010-12-01 10:40:05 -08:00
parent f38b709e47 525566893b
commit 869fa653e0
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wifi/java/android/net/wifi/WifiStateTracker.java
View File

@@ -1462,22 +1462,21 @@ public class WifiStateTracker extends NetworkStateTracker {
} }
private void requestConnectionStatus(WifiInfo info) { private void requestConnectionStatus(WifiInfo info) {
String SSID = null;
String BSSID = null;
String suppState = null;
int netId = -1;
String reply = status(); String reply = status();
if (reply == null) { if (reply != null) {
return;
}
/* /*
* Parse the reply from the supplicant to the status command, and update * Parse the reply from the supplicant to the status command, and update
* local state accordingly. The reply is a series of lines of the form * local state accordingly. The reply is a series of lines of the form
* "name=value". * "name=value".
*/ */
String SSID = null;
String BSSID = null;
String suppState = null;
int netId = -1;
String[] lines = reply.split("\n"); String[] lines = reply.split("\n");
for (String line : lines) { for (String line : lines) {
String[] prop = line.split(" *= *", 2); String[] prop = line.split(" *= *");
if (prop.length < 2) if (prop.length < 2)
continue; continue;
String name = prop[0]; String name = prop[0];
@@ -1491,6 +1490,7 @@ public class WifiStateTracker extends NetworkStateTracker {
else if (name.equalsIgnoreCase("wpa_state")) else if (name.equalsIgnoreCase("wpa_state"))
suppState = value; suppState = value;
} }
}
info.setNetworkId(netId); info.setNetworkId(netId);
info.setSSID(SSID); info.setSSID(SSID);
info.setBSSID(BSSID); info.setBSSID(BSSID);