Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0513282 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

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

* commit '1d29bde1':
  Avoid sending identity along with EAP sim, aka & aka'.
parents 699ef29e 1d29bde1

src/com/android/settings/wifi/WifiConfigController.java

+11 −3
Original line number Diff line number Diff line
@@ -458,9 +458,17 @@ public class WifiConfigController implements TextWatcher, 
                String clientCert = (String) mEapUserCertSpinner.getSelectedItem();

                if (clientCert.equals(unspecifiedCert)) clientCert = "";

                config.enterpriseConfig.setClientCertificateAlias(clientCert);

                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.