diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-09-23 17:46:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-23 17:46:00 +0000 |
| commit | 662c326e5fc02fa11226de1267b7f60485f5638a (patch) | |
| tree | f22f31a4fd69cc53d817510c9db106a5ced38273 /wifi/java | |
| parent | 75256476c87cc8c4f7e5124c9b944c37b2f51d3d (diff) | |
| parent | 2871588101c9bf1e6c9573599dee9be106466175 (diff) | |
| download | frameworks_base-662c326e5fc02fa11226de1267b7f60485f5638a.zip frameworks_base-662c326e5fc02fa11226de1267b7f60485f5638a.tar.gz frameworks_base-662c326e5fc02fa11226de1267b7f60485f5638a.tar.bz2 | |
Merge "Allow yet another combination of key management options" into klp-dev
Diffstat (limited to 'wifi/java')
| -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 4c84f17..87afa88 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; } } |