diff options
| author | Prem Kumar <premk@google.com> | 2014-09-15 00:51:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-15 00:51:13 +0000 |
| commit | 97a0c45cf88ce88b3f40a0966d029871bb03f2ba (patch) | |
| tree | b0505f804e18b8feb1ca344129cf1749d3d33329 | |
| parent | 95686694f70a12978bbc4bc5eba2d59b88efd3c9 (diff) | |
| parent | 26a98001ad3ec626f18fd57165ccc404f80d4e51 (diff) | |
| download | frameworks_base-97a0c45cf88ce88b3f40a0966d029871bb03f2ba.zip frameworks_base-97a0c45cf88ce88b3f40a0966d029871bb03f2ba.tar.gz frameworks_base-97a0c45cf88ce88b3f40a0966d029871bb03f2ba.tar.bz2 | |
Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 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: |