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

am de3e5665: Add phase2 authentication settings

Browse Source 
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
  Add phase2 authentication settings
This commit is contained in:
Irfan Sheriff
2010-06-03 11:13:21 -07:00
committed by Android Git Automerger
parent 7c5717c064 de3e56650d
commit a496684019
23 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiDialog.java
View File

@@ -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,