diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-09-24 10:22:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-24 10:22:18 -0700 |
| commit | ad93dc7f5cfda67c1b4043a102f0f3246ee1fef1 (patch) | |
| tree | 0a89e9b515802a170915444f0783405efe844667 /wifi | |
| parent | 9f584e576f1511b96a599244474035249f0c498e (diff) | |
| parent | 10914a23f71b42a2b9d08a0199689d84117d5e0c (diff) | |
| download | frameworks_base-ad93dc7f5cfda67c1b4043a102f0f3246ee1fef1.zip frameworks_base-ad93dc7f5cfda67c1b4043a102f0f3246ee1fef1.tar.gz frameworks_base-ad93dc7f5cfda67c1b4043a102f0f3246ee1fef1.tar.bz2 | |
am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev
* commit '10914a23f71b42a2b9d08a0199689d84117d5e0c':
Allow yet another combination of key management options
Diffstat (limited to 'wifi')
| -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; } } |