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

2014-09-15 00:51:12 +00:00
parent 95686694f7 26a98001ad
commit 97a0c45cf8
1 changed files with 3 additions and 1 deletions
--- 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: