From f1165c14c5bce0f03691b024127e019a6a2e8c47 Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Tue, 11 Aug 2015 18:42:36 -0700 Subject: [PATCH] Avoid sending identity along with EAP sim, aka & aka'. Bug: 22358498 Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f --- .../settings/wifi/WifiConfigController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 1a4b1ddfac0..774c54bd52b 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -458,9 +458,17 @@ public class WifiConfigController implements TextWatcher, String clientCert = (String) mEapUserCertSpinner.getSelectedItem(); if (clientCert.equals(unspecifiedCert)) clientCert = ""; config.enterpriseConfig.setClientCertificateAlias(clientCert); - config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString()); - config.enterpriseConfig.setAnonymousIdentity( - mEapAnonymousView.getText().toString()); + if (eapMethod == Eap.SIM || eapMethod == Eap.AKA || eapMethod == Eap.AKA_PRIME) { + config.enterpriseConfig.setIdentity(""); + config.enterpriseConfig.setAnonymousIdentity(""); + } else if (eapMethod == Eap.PWD) { + config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString()); + config.enterpriseConfig.setAnonymousIdentity(""); + } else { + config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString()); + config.enterpriseConfig.setAnonymousIdentity( + mEapAnonymousView.getText().toString()); + } if (mPasswordView.isShown()) { // For security reasons, a previous password is not displayed to user.