diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-09-20 15:21:33 -0700 |
|---|---|---|
| committer | Vinit Deshapnde <vinitd@google.com> | 2013-09-20 15:21:33 -0700 |
| commit | 2871588101c9bf1e6c9573599dee9be106466175 (patch) | |
| tree | b11e0a09f92a0259f006f112e89f9585f1257988 /wifi/java/android/net | |
| parent | 6df7d4a574ffd85c82cad402552e3854df3a3f85 (diff) | |
| download | frameworks_base-2871588101c9bf1e6c9573599dee9be106466175.zip frameworks_base-2871588101c9bf1e6c9573599dee9be106466175.tar.gz frameworks_base-2871588101c9bf1e6c9573599dee9be106466175.tar.bz2 | |
Allow yet another combination of key management options
Framework sets allowedKeyManagement to WPA_EAP + WPA_PSK, if
WifiConfiguration didn't supply any value for it. It should probably
change to NONE; but that is post K thing. I am allowing that
combination for now.
Bug: 10843500
Change-Id: Id0c28f4aaf32c6a7e7dca07114a2452ce194a798
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 2b3c9e2..59011b2 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -361,7 +361,8 @@ public class WifiConfiguration implements Parcelable { if (allowedKeyManagement.get(KeyMgmt.WPA_EAP) == false) { return false; } - if (allowedKeyManagement.get(KeyMgmt.IEEE8021X) == false) { + if ((allowedKeyManagement.get(KeyMgmt.IEEE8021X) == false) + && (allowedKeyManagement.get(KeyMgmt.WPA_PSK) == false)) { return false; } } |