Merge "Consider current EAP TLS configurations as 'valid'" into klp-dev (c06b1db2) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -355,8 +355,16 @@ public class WifiConfiguration implements Parcelable {
		*/
		public boolean isValid() {
		if (allowedKeyManagement.cardinality() > 1) {
		if (allowedKeyManagement.cardinality() != 2) {
		return false;
		}
		if (allowedKeyManagement.get(KeyMgmt.WPA_EAP) == false) {
		return false;
		}
		if (allowedKeyManagement.get(KeyMgmt.IEEE8021X) == false) {
		return false;
		}
		}

		// TODO: Add more checks
		return true;