diff options
| author | Prem Kumar <premk@google.com> | 2014-09-15 02:13:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-15 02:13:18 +0000 |
| commit | 58e5d5e4c62e94542f39b157d5130bcb8205eef1 (patch) | |
| tree | 9913e79e7d09afff458926fcaea15df91493b2b2 /wifi/java/android | |
| parent | 3c86afa9fbb4d04a64447fee6957a4c6c21e5172 (diff) | |
| parent | e2b32aff76c4ca8953163825f0806bc31bb0ce8a (diff) | |
| download | frameworks_base-58e5d5e4c62e94542f39b157d5130bcb8205eef1.zip frameworks_base-58e5d5e4c62e94542f39b157d5130bcb8205eef1.tar.gz frameworks_base-58e5d5e4c62e94542f39b157d5130bcb8205eef1.tar.bz2 | |
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
Diffstat (limited to 'wifi/java/android')
| -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: |