PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev

Browse Source 
* commit 'd0513282f81d8218eb0fef93a7316a6699d087f7':
  Avoid sending identity along with EAP sim, aka & aka'.
This commit is contained in:
Sanket Padawe
2015-08-12 17:50:54 +00:00
committed by Android Git Automerger
parent ce821387ba d0513282f8
commit 8d425a526b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -458,9 +458,17 @@ public class WifiConfigController implements TextWatcher,
String clientCert = (String) mEapUserCertSpinner.getSelectedItem(); String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
if (clientCert.equals(unspecifiedCert)) clientCert = ""; if (clientCert.equals(unspecifiedCert)) clientCert = "";
config.enterpriseConfig.setClientCertificateAlias(clientCert); config.enterpriseConfig.setClientCertificateAlias(clientCert);
config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString()); if (eapMethod == Eap.SIM || eapMethod == Eap.AKA || eapMethod == Eap.AKA_PRIME) {
config.enterpriseConfig.setAnonymousIdentity( config.enterpriseConfig.setIdentity("");
mEapAnonymousView.getText().toString()); 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()) { if (mPasswordView.isShown()) {
// For security reasons, a previous password is not displayed to user. // For security reasons, a previous password is not displayed to user.