am 27f19d75: am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev
* commit '27f19d75d3dd5e6c8524a8214fa768052c396849':
Allow creating EAP_TLS network without specifying Phase2.None
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: