resolved conflicts for merge of 52556689 to gingerbread-plus-aosp (869fa653) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiStateTracker.java

+24 −24

Original line number	Diff line number	Diff line
		@@ -1462,22 +1462,21 @@ public class WifiStateTracker extends NetworkStateTracker {
		}

		private void requestConnectionStatus(WifiInfo info) {
		String SSID = null;
		String BSSID = null;
		String suppState = null;
		int netId = -1;
		String reply = status();
		if (reply == null) {
		return;
		}
		if (reply != null) {
		/*
		* 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
		* "name=value".
		*/
		String SSID = null;
		String BSSID = null;
		String suppState = null;
		int netId = -1;

		String[] lines = reply.split("\n");
		for (String line : lines) {
		String[] prop = line.split(" = ", 2);
		String[] prop = line.split(" = ");
		if (prop.length < 2)
		continue;
		String name = prop[0];
		@@ -1491,6 +1490,7 @@ public class WifiStateTracker extends NetworkStateTracker {
		else if (name.equalsIgnoreCase("wpa_state"))
		suppState = value;
		}
		}
		info.setNetworkId(netId);
		info.setSSID(SSID);
		info.setBSSID(BSSID);