diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-02-11 15:55:31 -0800 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@android.com> | 2013-02-15 15:38:21 -0800 |
| commit | a51d1fb34581cf341b82d2b6d25533d182d4f084 (patch) | |
| tree | fd9d217673f28732acb2ae278649987e28136158 | |
| parent | 0e221880881cd154a1e57d83065f6c2d917f348a (diff) | |
| download | packages_apps_Settings-a51d1fb34581cf341b82d2b6d25533d182d4f084.tar.gz packages_apps_Settings-a51d1fb34581cf341b82d2b6d25533d182d4f084.tar.bz2 packages_apps_Settings-a51d1fb34581cf341b82d2b6d25533d182d4f084.zip | |
Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index c412b37b5..60ab1ca3a 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -395,10 +395,10 @@ public class WifiConfigController implements TextWatcher, } String caCert = (String) mEapCaCertSpinner.getSelectedItem(); if (caCert.equals(unspecifiedCert)) caCert = ""; - config.enterpriseConfig.setCaCertificate(caCert); + config.enterpriseConfig.setCaCertificateAlias(caCert); String clientCert = (String) mEapUserCertSpinner.getSelectedItem(); if (clientCert.equals(unspecifiedCert)) clientCert = ""; - config.enterpriseConfig.setClientCertificate(clientCert); + config.enterpriseConfig.setClientCertificateAlias(clientCert); config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString()); config.enterpriseConfig.setAnonymousIdentity( mEapAnonymousView.getText().toString()); @@ -582,9 +582,9 @@ public class WifiConfigController implements TextWatcher, // Modifying an existing network if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) { - WifiConfiguration config = mAccessPoint.getConfig(); - int eapMethod = config.enterpriseConfig.getEapMethod(); - int phase2Method = config.enterpriseConfig.getPhase2Method(); + WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig; + int eapMethod = enterpriseConfig.getEapMethod(); + int phase2Method = enterpriseConfig.getPhase2Method(); mEapMethodSpinner.setSelection(eapMethod); showEapFieldsByMethod(eapMethod); switch (eapMethod) { @@ -608,10 +608,10 @@ public class WifiConfigController implements TextWatcher, mPhase2Spinner.setSelection(phase2Method); break; } - setSelection(mEapCaCertSpinner, config.enterpriseConfig.getCaCertificate()); - setSelection(mEapUserCertSpinner, config.enterpriseConfig.getClientCertificate()); - mEapIdentityView.setText(config.enterpriseConfig.getIdentity()); - mEapAnonymousView.setText(config.enterpriseConfig.getAnonymousIdentity()); + setSelection(mEapCaCertSpinner, enterpriseConfig.getCaCertificateAlias()); + setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias()); + mEapIdentityView.setText(enterpriseConfig.getIdentity()); + mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity()); } else { // Choose a default for a new network and show only appropriate // fields |