commit 97a0c45cf88ce88b3f40a0966d029871bb03f2ba
author Prem Kumar <premk@google.com> Mon Sep 15 00:51:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 15 00:51:13 2014 +0000
tree b0505f804e18b8feb1ca344129cf1749d3d33329
parent 95686694f70a12978bbc4bc5eba2d59b88efd3c9
parent 26a98001ad3ec626f18fd57165ccc404f80d4e51

Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index 1484d49..cf3cba3 100644
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -271,9 +271,11 @@
     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: