diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-09-16 15:09:21 -0700 |
|---|---|---|
| committer | Vinit Deshapnde <vinitd@google.com> | 2013-09-16 15:09:21 -0700 |
| commit | 3b25f51609209ecd1374278b3dbec55a7bd15813 (patch) | |
| tree | 07d896b5b79b635c6e259b52d810cfa250765ad2 /wifi/java/android/net | |
| parent | 7354b834fc53a9d1885553aea58f632df16a5655 (diff) | |
| download | frameworks_base-3b25f51609209ecd1374278b3dbec55a7bd15813.zip frameworks_base-3b25f51609209ecd1374278b3dbec55a7bd15813.tar.gz frameworks_base-3b25f51609209ecd1374278b3dbec55a7bd15813.tar.bz2 | |
Consider current EAP TLS configurations as 'valid'
Multiple authentication methods are currently considered invalid; but
WPA_EAP and IEEE8021X are set simultaneously. This means we need to
fix code to consider them a valid combination.
Bug: 10325089
Change-Id: I2b4f4d75f21df78bfca66a930e85214c0cd6922e
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 |