diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-06-03 11:13:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-03 11:13:21 -0700 |
| commit | a496684019497395b71c6d460501197a74e21e0e (patch) | |
| tree | 4372a8e824ea938708f30c7ce69ab4f5c00a757c /src/com/android/settings/wifi | |
| parent | 7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c (diff) | |
| parent | de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1 (diff) | |
| download | packages_apps_settings-a496684019497395b71c6d460501197a74e21e0e.zip packages_apps_settings-a496684019497395b71c6d460501197a74e21e0e.tar.gz packages_apps_settings-a496684019497395b71c6d460501197a74e21e0e.tar.bz2 | |
am de3e5665: Add phase2 authentication settings
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp
* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
Add phase2 authentication settings
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiDialog.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java index f85d054..a8bf717 100644 --- a/src/com/android/settings/wifi/WifiDialog.java +++ b/src/com/android/settings/wifi/WifiDialog.java @@ -60,6 +60,7 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, private Spinner mEapMethod; private Spinner mEapCaCert; + private Spinner mPhase2; private Spinner mEapUserCert; private TextView mEapIdentity; private TextView mEapAnonymous; @@ -141,6 +142,9 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, config.allowedKeyManagement.set(KeyMgmt.WPA_EAP); config.allowedKeyManagement.set(KeyMgmt.IEEE8021X); config.eap.setValue((String) mEapMethod.getSelectedItem()); + + config.phase2.setValue((mPhase2.getSelectedItemPosition() == 0) ? "" : + "auth=" + mPhase2.getSelectedItem()); config.ca_cert.setValue((mEapCaCert.getSelectedItemPosition() == 0) ? "" : KEYSTORE_SPACE + Credentials.CA_CERTIFICATE + (String) mEapCaCert.getSelectedItem()); @@ -302,6 +306,7 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, if (mEapMethod == null) { mEapMethod = (Spinner) mView.findViewById(R.id.method); + mPhase2 = (Spinner) mView.findViewById(R.id.phase2); mEapCaCert = (Spinner) mView.findViewById(R.id.ca_cert); mEapUserCert = (Spinner) mView.findViewById(R.id.user_cert); mEapIdentity = (TextView) mView.findViewById(R.id.identity); @@ -313,6 +318,7 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, if (mAccessPoint != null && mAccessPoint.networkId != -1) { WifiConfiguration config = mAccessPoint.getConfig(); setSelection(mEapMethod, config.eap.value()); + setSelection(mPhase2, config.phase2.value()); setCertificate(mEapCaCert, Credentials.CA_CERTIFICATE, config.ca_cert.value()); setCertificate(mEapUserCert, Credentials.USER_PRIVATE_KEY, |