am c456bf13: am 8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev (904de8e4) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13226,6 +13226,7 @@ package android.net.wifi {
	field public java.lang.String capabilities;		field public java.lang.String capabilities;
	field public int frequency;		field public int frequency;
	field public int level;		field public int level;
			field public long timestamp;
	}		}

	public final class SupplicantState extends java.lang.Enum implements android.os.Parcelable {		public final class SupplicantState extends java.lang.Enum implements android.os.Parcelable {

wifi/java/android/net/wifi/ScanResult.java

+26 −4

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,12 @@ public class ScanResult implements Parcelable {
	*/		*/
	public int frequency;		public int frequency;

			/**
			* Time Synchronization Function (tsf) timestamp in microseconds when
			* this result was last seen.
			*/
			public long timestamp;

	/**		/**
	* We'd like to obtain the following attributes,		* We'd like to obtain the following attributes,
	* but they are not reported via the socket		* but they are not reported via the socket
	@@ -53,13 +59,25 @@ public class ScanResult implements Parcelable {
	* internally by wpa_supplicant.		* internally by wpa_supplicant.
	* {@hide}		* {@hide}
	*/		*/
	public ScanResult(String SSID, String BSSID, String caps, int level, int frequency) {		public ScanResult(String SSID, String BSSID, String caps, int level, int frequency, long tsf) {
	this.SSID = SSID;		this.SSID = SSID;
	this.BSSID = BSSID;		this.BSSID = BSSID;
	this.capabilities = caps;		this.capabilities = caps;
	this.level = level;		this.level = level;
	this.frequency = frequency;		this.frequency = frequency;
	//networkConfig = null;		this.timestamp = tsf;
			}

			/** copy constructor {@hide} */
			public ScanResult(ScanResult source) {
			if (source != null) {
			SSID = source.SSID;
			BSSID = source.BSSID;
			capabilities = source.capabilities;
			level = source.level;
			frequency = source.frequency;
			timestamp = source.timestamp;
			}
	}		}

	@Override		@Override
	@@ -76,7 +94,9 @@ public class ScanResult implements Parcelable {
	append(", level: ").		append(", level: ").
	append(level).		append(level).
	append(", frequency: ").		append(", frequency: ").
	append(frequency);		append(frequency).
			append(", timestamp: ").
			append(timestamp);

	return sb.toString();		return sb.toString();
	}		}
	@@ -93,6 +113,7 @@ public class ScanResult implements Parcelable {
	dest.writeString(capabilities);		dest.writeString(capabilities);
	dest.writeInt(level);		dest.writeInt(level);
	dest.writeInt(frequency);		dest.writeInt(frequency);
			dest.writeLong(timestamp);
	}		}

	/** Implement the Parcelable interface {@hide} */		/** Implement the Parcelable interface {@hide} */
	@@ -104,7 +125,8 @@ public class ScanResult implements Parcelable {
	in.readString(),		in.readString(),
	in.readString(),		in.readString(),
	in.readInt(),		in.readInt(),
	in.readInt()		in.readInt(),
			in.readLong()
	);		);
	}		}

wifi/java/android/net/wifi/WifiNative.java

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -197,8 +197,22 @@ public class WifiNative {
	return null;		return null;
	}		}

			/**
			* Format of results:
			* =================
			* bssid=68:7f:74:d7:1b:6e
			* freq=2412
			* level=-43
			* tsf=1344621975160944
			* age=2623
			* flags=[WPA2-PSK-CCMP][WPS][ESS]
			* ssid=zubyb
			*
			* RANGE=ALL gets all scan results
			* MASK=<N> see wpa_supplicant/src/common/wpa_ctrl.h for details
			*/
	public String scanResults() {		public String scanResults() {
	return doStringCommand("SCAN_RESULTS");		return doStringCommand("BSS RANGE=ALL MASK=0x1986");
	}		}

	public boolean startDriver() {		public boolean startDriver() {

wifi/java/android/net/wifi/WifiStateMachine.java

+88 −110

Original line number	Original line	Diff line number	Diff line
	@@ -891,7 +891,13 @@ public class WifiStateMachine extends StateMachine {
	* TODO: doc		* TODO: doc
	*/		*/
	public List<ScanResult> syncGetScanResultsList() {		public List<ScanResult> syncGetScanResultsList() {
	return mScanResults;		synchronized (mScanResultCache) {
			List<ScanResult> scanList = new ArrayList<ScanResult>();
			for(ScanResult result: mScanResults) {
			scanList.add(new ScanResult(result));
			}
			return scanList;
			}
	}		}

	/**		/**
	@@ -1357,131 +1363,103 @@ public class WifiStateMachine extends StateMachine {
	mContext.sendStickyBroadcast(intent);		mContext.sendStickyBroadcast(intent);
	}		}

			private static final String BSSID_STR = "bssid=";
			private static final String FREQ_STR = "freq=";
			private static final String LEVEL_STR = "level=";
			private static final String TSF_STR = "tsf=";
			private static final String FLAGS_STR = "flags=";
			private static final String SSID_STR = "ssid=";
			private static final String DELIMITER_STR = "====";
	/**		/**
	* Parse the scan result line passed to us by wpa_supplicant (helper).		* Format:
	* @param line the line to parse		* bssid=68:7f:76:d7:1a:6e
	* @return the {@link ScanResult} object		* freq=2412
	*/		* level=-44
	private ScanResult parseScanResult(String line) {		* tsf=1344626243700342
	ScanResult scanResult = null;		* flags=[WPA2-PSK-CCMP][WPS][ESS]
	if (line != null) {		* ssid=zfdy
	/*		* ====
	* Cache implementation (LinkedHashMap) is not synchronized, thus,		* bssid=68:5f:74:d7:1a:6f
	* must synchronized here!		* freq=5180
			* level=-73
			* tsf=1344626243700373
			* flags=[WPA2-PSK-CCMP][WPS][ESS]
			* ssid=zuby
			* ====
	*/		*/
			private void setScanResults(String scanResults) {
			String bssid = "";
			int level = 0;
			int freq = 0;
			long tsf = 0;
			String flags = "";
			String ssid = "";

			if (scanResults == null) {
			return;
			}

	synchronized(mScanResultCache) {		synchronized(mScanResultCache) {
	String[] result = scanResultPattern.split(line);		mScanResults = new ArrayList<ScanResult>();
	if (3 <= result.length && result.length <= 5) {		String[] lines = scanResults.split("\n");
	String bssid = result[0];
	// bssid \| frequency \| level \| flags \| ssid		for (String line : lines) {
	int frequency;		if (line.startsWith(BSSID_STR)) {
	int level;		bssid = line.substring(BSSID_STR.length());
			} else if (line.startsWith(FREQ_STR)) {
	try {		try {
	frequency = Integer.parseInt(result[1]);		freq = Integer.parseInt(line.substring(FREQ_STR.length()));
	level = Integer.parseInt(result[2]);		} catch (NumberFormatException e) {
			freq = 0;
			}
			} else if (line.startsWith(LEVEL_STR)) {
			try {
			level = Integer.parseInt(line.substring(LEVEL_STR.length()));
	/* some implementations avoid negative values by adding 256		/* some implementations avoid negative values by adding 256
	* so we need to adjust for that here.		* so we need to adjust for that here.
	*/		*/
	if (level > 0) level -= 256;		if (level > 0) level -= 256;
	} catch(NumberFormatException e) {		} catch(NumberFormatException e) {
	frequency = 0;
	level = 0;		level = 0;
	}		}
			} else if (line.startsWith(TSF_STR)) {
	/*		try {
	* The formatting of the results returned by		tsf = Long.parseLong(line.substring(TSF_STR.length()));
	* wpa_supplicant is intended to make the fields		} catch (NumberFormatException e) {
	* line up nicely when printed,		tsf = 0;
	* not to make them easy to parse. So we have to		}
	* apply some heuristics to figure out which field		} else if (line.startsWith(FLAGS_STR)) {
	* is the SSID and which field is the flags.		flags = line.substring(FLAGS_STR.length());
	*/		} else if (line.startsWith(SSID_STR)) {
	String ssid;		ssid = line.substring(SSID_STR.length());
	String flags;		if (ssid == null) ssid = "";
	if (result.length == 4) {		} else if (line.startsWith(DELIMITER_STR)) {
	if (result[3].charAt(0) == '[') {		if (bssid != null) {
	flags = result[3];
	ssid = "";
	} else {
	flags = "";
	ssid = result[3];
	}
	} else if (result.length == 5) {
	flags = result[3];
	ssid = result[4];
	} else {
	// Here, we must have 3 fields: no flags and ssid
	// set
	flags = "";
	ssid = "";
	}

	// bssid + ssid is the hash key
	String key = bssid + ssid;		String key = bssid + ssid;
	scanResult = mScanResultCache.get(key);		ScanResult scanResult = mScanResultCache.get(key);
	if (scanResult != null) {		if (scanResult != null) {
	scanResult.level = level;		scanResult.level = level;
	scanResult.SSID = ssid;		scanResult.SSID = ssid;
	scanResult.capabilities = flags;		scanResult.capabilities = flags;
	scanResult.frequency = frequency;		scanResult.frequency = freq;
			scanResult.timestamp = tsf;
	} else {		} else {
	// Do not add scan results that have no SSID set
	if (0 < ssid.trim().length()) {
	scanResult =		scanResult =
	new ScanResult(		new ScanResult(
	ssid, bssid, flags, level, frequency);		ssid, bssid, flags, level, freq, tsf);
	mScanResultCache.put(key, scanResult);		mScanResultCache.put(key, scanResult);
	}		}
			mScanResults.add(scanResult);
	}		}
	} else {		bssid = null;
	loge("Misformatted scan result text with " +		level = 0;
	result.length + " fields: " + line);		freq = 0;
	}		tsf = 0;
	}		flags = "";
	}		ssid = "";

	return scanResult;
	}

	/**
	* scanResults input format
	* 00:bb:cc:dd:cc:ee 2427 166 [WPA-EAP-TKIP][WPA2-EAP-CCMP] Net1
	* 00:bb:cc:dd:cc:ff 2412 165 [WPA-EAP-TKIP][WPA2-EAP-CCMP] Net2
	*/
	private void setScanResults(String scanResults) {
	if (scanResults == null) {
	return;
	}

	List<ScanResult> scanList = new ArrayList<ScanResult>();

	int lineCount = 0;

	int scanResultsLen = scanResults.length();
	// Parse the result string, keeping in mind that the last line does
	// not end with a newline.
	for (int lineBeg = 0, lineEnd = 0; lineEnd <= scanResultsLen; ++lineEnd) {
	if (lineEnd == scanResultsLen \|\| scanResults.charAt(lineEnd) == '\n') {
	++lineCount;

	if (lineCount == 1) {
	lineBeg = lineEnd + 1;
	continue;
	}
	if (lineEnd > lineBeg) {
	String line = scanResults.substring(lineBeg, lineEnd);
	ScanResult scanResult = parseScanResult(line);
	if (scanResult != null) {
	scanList.add(scanResult);
	} else {
	//TODO: hidden network handling
	}
	}		}
	lineBeg = lineEnd + 1;
	}		}
	}		}

	mScanResults = scanList;
	}		}

	/*		/*
	@@ -2828,7 +2806,7 @@ public class WifiStateMachine extends StateMachine {
	if (DBG) log(getName() + "\n");		if (DBG) log(getName() + "\n");
	mIsRunning = false;		mIsRunning = false;
	updateBatteryWorkSource(null);		updateBatteryWorkSource(null);
	mScanResults = null;		mScanResults = new ArrayList<ScanResult>();

	if (mP2pSupported) mWifiP2pChannel.sendMessage(WifiStateMachine.CMD_DISABLE_P2P);		if (mP2pSupported) mWifiP2pChannel.sendMessage(WifiStateMachine.CMD_DISABLE_P2P);
	mContext.unregisterReceiver(mScreenReceiver);		mContext.unregisterReceiver(mScreenReceiver);