summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2009-06-11 17:56:04 +0800
committerChung-yih Wang <cywang@google.com>2009-06-11 17:56:04 +0800
commite97bfa3c2581bc59eceaaf043b7059dc29307884 (patch)
treebf02824bad66727a43fda1e68bc11d9050c949ef /src/com
parent289705f3311932a45adef1710358f5e302115013 (diff)
downloadpackages_apps_Settings-e97bfa3c2581bc59eceaaf043b7059dc29307884.tar.gz
packages_apps_Settings-e97bfa3c2581bc59eceaaf043b7059dc29307884.tar.bz2
packages_apps_Settings-e97bfa3c2581bc59eceaaf043b7059dc29307884.zip
Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/wifi/AccessPointDialog.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java
index 66fdbd2de..572ca85a5 100644
--- a/src/com/android/settings/wifi/AccessPointDialog.java
+++ b/src/com/android/settings/wifi/AccessPointDialog.java
@@ -607,7 +607,22 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
}
} else {
- mState.setSecurity(AccessPointState.OPEN);
+ switch (securityType) {
+ case SECURITY_WPA_EAP:
+ mState.setSecurity(AccessPointState.WPA_EAP);
+ break;
+ case SECURITY_IEEE8021X:
+ mState.setSecurity(AccessPointState.IEEE8021X);
+ break;
+ default:
+ mState.setSecurity(AccessPointState.OPEN);
+ break;
+ }
+ if (isEnterprise() && !mState.configured) {
+ updateEnterpriseFields(
+ AccessPointState.WPA_EAP.equals(mState.security) ?
+ SECURITY_WPA_EAP : SECURITY_IEEE8021X);
+ }
}
if (securityType == SECURITY_NONE) {