diff options
| author | 2013-09-16 23:52:57 +0000 | |
|---|---|---|
| committer | 2013-09-16 23:52:57 +0000 | |
| commit | c06b1db22278f00ef55b2fff00bf9d905286d6e0 (patch) | |
| tree | 55201f435e5d3e1924d70d3bc06a4eadeea83a64 | |
| parent | c8d19b894ebe659d9508a9a4763388d8573c6d76 (diff) | |
| parent | 3b25f51609209ecd1374278b3dbec55a7bd15813 (diff) | |
Merge "Consider current EAP TLS configurations as 'valid'" into klp-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 2ce584b2b206..2b3c9e21bed1 100644 --- 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 |