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

am b2295174: Add the missing phase2 field in EAP configuration.

Browse Source 
Merge commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86'

* commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86':
  Add the missing phase2 field in EAP configuration.
This commit is contained in:
Chung-yih Wang
2009-07-22 11:51:10 -07:00
committed by Android Git Automerger
parent 8a45c87d41 b2295174dc
commit 7073178985
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/wifi/AccessPointDialog.java
View File

@@ -246,7 +246,6 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
} else if (mMode == MODE_INFO) {
if (mState.isEnterprise() && !mState.configured) {
setLayout(R.layout.wifi_ap_configure);
defaultPasswordVisibility = false;
setEnterpriseFieldsVisible(true);
} else {
setLayout(R.layout.wifi_ap_info);
@@ -319,6 +318,8 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
if (mMode == MODE_CONFIGURE ||
(mState.isEnterprise() && !mState.configured)) {
setEnterpriseFields(view);
mPhase2Spinner.setSelection(getSelectionIndex(
R.array.wifi_phase2_entries, mState.getPhase2()));
mEapSpinner.setSelection(getSelectionIndex(
R.array.wifi_eap_entries, mState.getEap()));
mClientCertSpinner.setSelection(getSelectionIndex(
@@ -663,14 +664,15 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
}
}
switch (securityType) {
case SECURITY_IEEE8021X:
case SECURITY_WPA_EAP: {
mState.setSecurity(AccessPointState.WPA_EAP);
mState.setEap(mEapSpinner.getSelectedItemPosition());
break;
}
case SECURITY_IEEE8021X: {
mState.setSecurity(AccessPointState.IEEE8021X);
if (securityType == SECURITY_WPA_EAP) {
mState.setSecurity(AccessPointState.WPA_EAP);
} else {
mState.setSecurity(AccessPointState.IEEE8021X);
}
mState.setEap(mEapSpinner.getSelectedItemPosition());
mState.setPhase2(mPhase2Spinner.getSelectedItem());
break;
}
default:

18
src/com/android/settings/wifi/AccessPointState.java
View File

@@ -375,12 +375,22 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
/* For Enterprise Fields */
public void setEnterpriseField(int field, String value) {
if (value != null && field >= 0 && field < MAX_ENTRPRISE_FIELD) {
if ((value != null) && (field >= 0) && (field < MAX_ENTRPRISE_FIELD)) {
this.mEnterpriseFields[field] = value;
requestRefresh();
}
}
public void setPhase2(String phase2) {
if (!TextUtils.isEmpty(phase2) && (!phase2.equals("None"))) {
mPhase2 = phase2;
}
}
public String getPhase2() {
return mPhase2;
}
public void setEap(int method) {
mEap = EAP_METHOD[method];
requestRefresh();
@@ -495,6 +505,12 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
config.hiddenSSID = hiddenSsid;
config.SSID = convertToQuotedString(ssid);
config.eap = mEap;
if (!TextUtils.isEmpty(mPhase2)) {
config.phase2 = convertToQuotedString("auth=" + mPhase2);
} else {
config.phase2 = null;
}
if (!TextUtils.isEmpty(mEnterpriseFields[IDENTITY])) {
config.identity =
convertToQuotedString(mEnterpriseFields[IDENTITY]);