Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow yet another combination of key management options" into klp-dev

Browse Source
This commit is contained in:
Vinit Deshapnde
2013-09-23 17:46:00 +00:00
committed by Android (Google) Code Review
parent 75256476c8 2871588101
commit 662c326e5f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -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;
}
}