am e97bfa3c
: Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Merge commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884' * commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884': Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
This commit is contained in:
committed by
The Android Open Source Project
commit
17f69c88f5
@@ -607,7 +607,22 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
|
|||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} 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) {
|
if (securityType == SECURITY_NONE) {
|
||||||
|
Reference in New Issue
Block a user