diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-09-16 16:58:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-16 16:58:46 -0700 |
| commit | d1fa1bb6900d6250dfdec92a274892b03f8ae15f (patch) | |
| tree | 71d8547bd989cbd48f26ef0db8ee4d5c5eb64842 /wifi/java/android/net | |
| parent | 259b9945d25d579c08507f6ddef15fb33c960ab3 (diff) | |
| parent | 007c6c7d358fc617252da40c9ff214f55312c6f8 (diff) | |
| download | frameworks_base-d1fa1bb6900d6250dfdec92a274892b03f8ae15f.zip frameworks_base-d1fa1bb6900d6250dfdec92a274892b03f8ae15f.tar.gz frameworks_base-d1fa1bb6900d6250dfdec92a274892b03f8ae15f.tar.bz2 | |
am 007c6c7d: am c06b1db2: Merge "Consider current EAP TLS configurations as \'valid\'" into klp-dev
* commit '007c6c7d358fc617252da40c9ff214f55312c6f8':
Consider current EAP TLS configurations as 'valid'
Diffstat (limited to 'wifi/java/android/net')
| -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 2ce584b..2b3c9e2 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 |