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

am c06b1db2: Merge "Consider current EAP TLS configurations as \'valid\'" into klp-dev

Browse Source 
* commit 'c06b1db22278f00ef55b2fff00bf9d905286d6e0':
  Consider current EAP TLS configurations as 'valid'
This commit is contained in:
Vinit Deshapnde
2013-09-16 16:56:12 -07:00
committed by Android Git Automerger
parent 74d2136477 c06b1db222
commit 007c6c7d35
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,7 +355,15 @@ public class WifiConfiguration implements Parcelable {
*/
public boolean isValid() {
if (allowedKeyManagement.cardinality() > 1) {
return false;
if (allowedKeyManagement.cardinality() != 2) {
return false;
}
if (allowedKeyManagement.get(KeyMgmt.WPA_EAP) == false) {
return false;
}
if (allowedKeyManagement.get(KeyMgmt.IEEE8021X) == false) {
return false;
}
}
// TODO: Add more checks