From 26a98001ad3ec626f18fd57165ccc404f80d4e51 Mon Sep 17 00:00:00 2001 From: Vinit Deshpande Date: Sat, 13 Sep 2014 11:10:07 -0700 Subject: [PATCH] Allow creating EAP_TLS network without specifying Phase2.None Phase2 isn't required for EAP_TLS networks, and it is possible for a developer to miss it. We are requiring it for internal book keeping - so this change just sets Phase2 to 'None' when EAP_TLS is set on the configuration. Bug: 17043082 Change-Id: I5a8e0a3a236d0dfd1295584de55d5b9a1b76b483 --- wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 1484d49905d35..cf3cba3ec0da0 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -271,9 +271,11 @@ public class WifiEnterpriseConfig implements Parcelable { public void setEapMethod(int eapMethod) { switch (eapMethod) { /** Valid methods */ + case Eap.TLS: + setPhase2Method(Phase2.NONE); + /* fall through */ case Eap.PEAP: case Eap.PWD: - case Eap.TLS: case Eap.TTLS: case Eap.SIM: case Eap.AKA: