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

am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev

Browse Source 
* commit '662c326e5fc02fa11226de1267b7f60485f5638a':
  Allow yet another combination of key management options
This commit is contained in:
Vinit Deshapnde
2013-09-23 18:59:02 -07:00
committed by Android Git Automerger
parent 05b51688f6 662c326e5f
commit 10914a23f7
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;
}
}