Merge "Consider current EAP TLS configurations as 'valid'" into klp-dev

2013-09-16 23:52:57 +00:00
parent c8d19b894e 3b25f51609
commit c06b1db222
1 changed files with 9 additions and 1 deletions
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -355,7 +355,15 @@ public class WifiConfiguration implements Parcelable {
     */
    public boolean isValid() {
        if (allowedKeyManagement.cardinality() > 1) {
-            return false;
+            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