Merge "autojoin fix for devices which are using the enableNEtwork API" (6c536eac) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiConfiguration.java

+21 −1

Original line number	Diff line number	Diff line
		@@ -802,6 +802,26 @@ public class WifiConfiguration implements Parcelable {
		return configKey(false);
		}

		/** @hide
		* return the config key string based on a scan result
		*/
		static public String configKey(ScanResult result) {
		String key = "\"" + result.SSID + "\"";

		if (result.capabilities.contains("WEP")) {
		key = key + "-WEP";
		}

		if (result.capabilities.contains("PSK")) {
		key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_PSK];
		}

		if (result.capabilities.contains("EAP")) {
		key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_EAP];
		}

		return key;
		}

		/** Implement the Parcelable interface {@hide} */
		public int describeContents() {