Merge "Expose bssids for AccessPoints" into nyc-dev (2b087ab0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
		private final Context mContext;

		private String ssid;
		private String bssid;
		private int security;
		private int networkId = WifiConfiguration.INVALID_NETWORK_ID;

		@@ -335,6 +336,10 @@ public class AccessPoint implements Comparable<AccessPoint> {
		return ssid;
		}

		public String getBssid() {
		return bssid;
		}

		public CharSequence getSsid() {
		SpannableString str = new SpannableString(ssid);
		str.setSpan(new TtsSpan.VerbatimBuilder(ssid).build(), 0, ssid.length(),
		@@ -657,6 +662,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
		else
		ssid = (config.SSID == null ? "" : removeDoubleQuotes(config.SSID));

		bssid = config.BSSID;
		security = getSecurity(config);
		networkId = config.networkId;
		mConfig = config;
		@@ -664,6 +670,7 @@ public class AccessPoint implements Comparable<AccessPoint> {

		private void initWithScanResult(ScanResult result) {
		ssid = result.SSID;
		bssid = result.BSSID;
		security = getSecurity(result);
		if (security == SECURITY_PSK)
		pskType = getPskType(result);