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

* commit 'a203fbc87ae41547afb9dbdd06dd41221ed75c26': Allow creating EAP_TLS network without specifying Phase2.None
2014-09-15 01:01:34 +00:00
parent 4c3a573e79 97a0c45cf8
commit 207283ad0d
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: