From 3b25f51609209ecd1374278b3dbec55a7bd15813 Mon Sep 17 00:00:00 2001 From: Vinit Deshapnde Date: Mon, 16 Sep 2013 15:09:21 -0700 Subject: [PATCH] Consider current EAP TLS configurations as 'valid' Multiple authentication methods are currently considered invalid; but WPA_EAP and IEEE8021X are set simultaneously. This means we need to fix code to consider them a valid combination. Bug: 10325089 Change-Id: I2b4f4d75f21df78bfca66a930e85214c0cd6922e --- wifi/java/android/net/wifi/WifiConfiguration.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 2ce584b2b2061..2b3c9e21bed17 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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