commit e97bfa3c2581bc59eceaaf043b7059dc29307884
author Chung-yih Wang <cywang@google.com> Thu Jun 11 17:56:04 2009 +0800
committer Chung-yih Wang <cywang@google.com> Thu Jun 11 17:56:04 2009 +0800
tree bf02824bad66727a43fda1e68bc11d9050c949ef
parent 289705f3311932a45adef1710358f5e302115013

Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.

src/com/android/settings/wifi/AccessPointDialog.java

diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java
index 66fdbd2..572ca85 100644
--- a/src/com/android/settings/wifi/AccessPointDialog.java
+++ b/src/com/android/settings/wifi/AccessPointDialog.java
@@ -607,7 +607,22 @@
                 
             }
         } 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) {