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

wifi: add WPA3 Enterprise entry in "Add network"

Browse Source 
Bug: 174569407
Test: checked UI manually and stored configurations.
Change-Id: I8a05bbb11e4a363c39a71d26513caf727d228b36
This commit is contained in:
Jimmy Chen
2021-03-04 02:50:43 +08:00
parent 6d513a2c67
commit e82e80450c
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -536,8 +536,9 @@ public class WifiConfigController implements TextWatcher,
} else { } else {
enabled = ipAndProxyFieldsAreValid(); enabled = ipAndProxyFieldsAreValid();
} }
if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP || if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP
mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B) || mAccessPointSecurity == AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE
|| mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B)
&& mEapCaCertSpinner != null && mEapCaCertSpinner != null
&& mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) { && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem(); String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
@@ -553,8 +554,9 @@ public class WifiConfigController implements TextWatcher,
enabled = false; enabled = false;
} }
} }
if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP || if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP
mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B) || mAccessPointSecurity == AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE
|| mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B)
&& mEapUserCertSpinner != null && mEapUserCertSpinner != null
&& mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE && mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE
&& mEapUserCertSpinner.getSelectedItem().equals(mUnspecifiedCertString)) { && mEapUserCertSpinner.getSelectedItem().equals(mUnspecifiedCertString)) {
@@ -651,10 +653,13 @@ public class WifiConfigController implements TextWatcher,
break; break;
case AccessPoint.SECURITY_EAP: case AccessPoint.SECURITY_EAP:
case AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE:
case AccessPoint.SECURITY_EAP_SUITE_B: case AccessPoint.SECURITY_EAP_SUITE_B:
if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B) { if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B) {
// allowedSuiteBCiphers will be set according to certificate type // allowedSuiteBCiphers will be set according to certificate type
config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B); config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
} else if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE) {
config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
} else { } else {
config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP); config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
} }
@@ -1693,9 +1698,14 @@ public class WifiConfigController implements TextWatcher,
if (mWifiManager.isWpa3SaeSupported()) { if (mWifiManager.isWpa3SaeSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae)); spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_SAE; mSecurityInPosition[idx++] = AccessPoint.SECURITY_SAE;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE;
} else {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
} }
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
if (mWifiManager.isWpa3SuiteBSupported()) { if (mWifiManager.isWpa3SuiteBSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb)); spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_SUITE_B; mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_SUITE_B;

15
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -500,6 +500,7 @@ public class WifiConfigController2 implements TextWatcher,
enabled = ipAndProxyFieldsAreValid(); enabled = ipAndProxyFieldsAreValid();
} }
if ((mWifiEntrySecurity == WifiEntry.SECURITY_EAP if ((mWifiEntrySecurity == WifiEntry.SECURITY_EAP
|| mWifiEntrySecurity == WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE
|| mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B) || mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B)
&& mEapCaCertSpinner != null && mEapCaCertSpinner != null
&& mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) { && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
@@ -517,6 +518,7 @@ public class WifiConfigController2 implements TextWatcher,
} }
} }
if ((mWifiEntrySecurity == WifiEntry.SECURITY_EAP if ((mWifiEntrySecurity == WifiEntry.SECURITY_EAP
|| mWifiEntrySecurity == WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE
|| mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B) || mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B)
&& mEapUserCertSpinner != null && mEapUserCertSpinner != null
&& mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE && mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE
@@ -615,10 +617,13 @@ public class WifiConfigController2 implements TextWatcher,
break; break;
case WifiEntry.SECURITY_EAP: case WifiEntry.SECURITY_EAP:
case WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE:
case WifiEntry.SECURITY_EAP_SUITE_B: case WifiEntry.SECURITY_EAP_SUITE_B:
if (mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B) { if (mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B) {
// allowedSuiteBCiphers will be set according to certificate type // allowedSuiteBCiphers will be set according to certificate type
config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B); config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
} else if (mWifiEntrySecurity == WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE) {
config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
} else { } else {
config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP); config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
} }
@@ -942,6 +947,7 @@ public class WifiConfigController2 implements TextWatcher,
} }
if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP
&& mWifiEntrySecurity != WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE
&& mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) { && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
mView.findViewById(R.id.eap).setVisibility(View.GONE); mView.findViewById(R.id.eap).setVisibility(View.GONE);
return; return;
@@ -1660,9 +1666,14 @@ public class WifiConfigController2 implements TextWatcher,
if (mWifiManager.isWpa3SaeSupported()) { if (mWifiManager.isWpa3SaeSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae)); spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_SAE; mSecurityInPosition[idx++] = WifiEntry.SECURITY_SAE;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE;
} else {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
} }
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
if (mWifiManager.isWpa3SuiteBSupported()) { if (mWifiManager.isWpa3SuiteBSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb)); spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb));
mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_SUITE_B; mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_SUITE_B;