diff options
| author | Chung-yih Wang <cywang@google.com> | 2009-07-22 11:51:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-22 11:51:10 -0700 |
| commit | 70731789853d08c249c6e5660dbaebc6d4a5aefd (patch) | |
| tree | f7680dcbeb664271faaf6c834e94277a6b23d1ba /src/com/android/settings/wifi/AccessPointDialog.java | |
| parent | 8a45c87d41080b00a232e9236f77cedee3402f19 (diff) | |
| parent | b2295174dcb27efa0bf2fb58bb31a517413d9c86 (diff) | |
| download | packages_apps_Settings-70731789853d08c249c6e5660dbaebc6d4a5aefd.tar.gz packages_apps_Settings-70731789853d08c249c6e5660dbaebc6d4a5aefd.tar.bz2 packages_apps_Settings-70731789853d08c249c6e5660dbaebc6d4a5aefd.zip | |
am b2295174: Add the missing phase2 field in EAP configuration.
Merge commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86'
* commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86':
Add the missing phase2 field in EAP configuration.
Diffstat (limited to 'src/com/android/settings/wifi/AccessPointDialog.java')
| -rw-r--r-- | src/com/android/settings/wifi/AccessPointDialog.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java index 3a179a0e1..878478bb8 100644 --- a/src/com/android/settings/wifi/AccessPointDialog.java +++ b/src/com/android/settings/wifi/AccessPointDialog.java @@ -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: |