diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-09-13 11:10:07 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2014-09-13 11:10:07 -0700 |
| commit | 26a98001ad3ec626f18fd57165ccc404f80d4e51 (patch) | |
| tree | 4c64503eef36e73d998154075a65c1c7a11edd3e /wifi/java | |
| parent | c0b8cb89105e814f2dc710c4b6f932ff726f0134 (diff) | |
| download | frameworks_base-26a98001ad3ec626f18fd57165ccc404f80d4e51.zip frameworks_base-26a98001ad3ec626f18fd57165ccc404f80d4e51.tar.gz frameworks_base-26a98001ad3ec626f18fd57165ccc404f80d4e51.tar.bz2 | |
Allow creating EAP_TLS network without specifying Phase2.None
Phase2 isn't required for EAP_TLS networks, and it is possible
for a developer to miss it. We are requiring it for internal
book keeping - so this change just sets Phase2 to 'None' when
EAP_TLS is set on the configuration.
Bug: 17043082
Change-Id: I5a8e0a3a236d0dfd1295584de55d5b9a1b76b483
Diffstat (limited to 'wifi/java')
| -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: |