diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-04-15 22:52:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 22:52:33 +0000 |
| commit | ed8cdbb780cda3701b433dd1d383bb88f180ff72 (patch) | |
| tree | cf2799b4ca3f66e1fcfd1cd38cefe6a2419ca575 /wifi | |
| parent | 9fbc8f70b6ccdecc95c968ecdb9f8f823bd92857 (diff) | |
| parent | 0b132962e4e324ca3b37f845d0792226d4f94d27 (diff) | |
| download | frameworks_base-ed8cdbb780cda3701b433dd1d383bb88f180ff72.zip frameworks_base-ed8cdbb780cda3701b433dd1d383bb88f180ff72.tar.gz frameworks_base-ed8cdbb780cda3701b433dd1d383bb88f180ff72.tar.bz2 | |
Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfigStore.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfigStore.java b/wifi/java/android/net/wifi/WifiConfigStore.java index d3d5b1b..23a4e71 100644 --- a/wifi/java/android/net/wifi/WifiConfigStore.java +++ b/wifi/java/android/net/wifi/WifiConfigStore.java @@ -1111,7 +1111,8 @@ class WifiConfigStore { break setVariables; } - if (config.enterpriseConfig != null) { + if (config.enterpriseConfig != null && + config.enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.NONE) { WifiEnterpriseConfig enterpriseConfig = config.enterpriseConfig; |