diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-27 23:48:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-27 23:48:00 +0000 |
| commit | 5ff70c1e7439427f3ab79d80158b65eb4dd5ccee (patch) | |
| tree | ea2fea4f6e614ea0f2c4e8c8cde76dbbbe792dd1 /service | |
| parent | a6ff93d77ccfdf527221f3dfa877303c14cea25d (diff) | |
| parent | 8c9f6f1ea469f8c6252228f9fd9b9029a486dd14 (diff) | |
Merge "Do not reset anonymous identity for PEAP" into oc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index d9f3c1a23..9020b8e0f 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2334,7 +2334,9 @@ public class WifiConfigManager { String currentIdentity = TelephonyUtil.getSimIdentity(mTelephonyManager, config); // Update the loaded config config.enterpriseConfig.setIdentity(currentIdentity); - config.enterpriseConfig.setAnonymousIdentity(""); + if (config.enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.PEAP) { + config.enterpriseConfig.setAnonymousIdentity(""); + } } } } |