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

Merge "[OWE] Support OWE in transition mode" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-14 13:57:05 +00:00
committed by Android (Google) Code Review
parent 421a05a6a9 98aa52dbec
commit ae6f6ab00a
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -582,9 +582,11 @@ public class WifiConfigController implements TextWatcher,
} }
/** /**
* Special handling for WPA2/WPA3 in Transition mode: The key SECURITY_PSK_SAE_TRANSITION is * Special handling for WPA2/WPA3 and OWE in Transition mode: The key
* a pseudo key which results by the scan results, but never appears in the saved networks. * SECURITY_PSK_SAE_TRANSITION and SECURITY_OWE_TRANSITION are pseudo keys which result by the
* A saved network is either WPA3 for supporting devices or WPA2 for non-supporting devices. * scan results, but never appears in the saved networks.
* A saved network is either WPA3 for supporting devices or WPA2 for non-supporting devices,
* or, OWE for supporting devices or Open for non-supporting devices.
* *
* @param accessPointSecurity Access point current security type * @param accessPointSecurity Access point current security type
* @return Converted security type (if required) * @return Converted security type (if required)
@@ -597,6 +599,14 @@ public class WifiConfigController implements TextWatcher,
return AccessPoint.SECURITY_PSK; return AccessPoint.SECURITY_PSK;
} }
} }
if (accessPointSecurity == AccessPoint.SECURITY_OWE_TRANSITION) {
if (mWifiManager.isEnhancedOpenSupported()) {
return AccessPoint.SECURITY_OWE;
} else {
return AccessPoint.SECURITY_NONE;
}
}
return accessPointSecurity; return accessPointSecurity;
} }
@@ -948,7 +958,8 @@ public class WifiConfigController implements TextWatcher,
private void showSecurityFields() { private void showSecurityFields() {
if (mAccessPointSecurity == AccessPoint.SECURITY_NONE || if (mAccessPointSecurity == AccessPoint.SECURITY_NONE ||
mAccessPointSecurity == AccessPoint.SECURITY_OWE) { mAccessPointSecurity == AccessPoint.SECURITY_OWE ||
mAccessPointSecurity == AccessPoint.SECURITY_OWE_TRANSITION) {
mView.findViewById(R.id.security_fields).setVisibility(View.GONE); mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
return; return;
} }

7
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -494,7 +494,9 @@ public class WifiSettings extends RestrictedSettingsFragment
if (isSavedNetwork) { if (isSavedNetwork) {
connect(mSelectedAccessPoint.getConfig(), isSavedNetwork); connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
} else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) || } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
(mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) { (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE) ||
(mSelectedAccessPoint.getSecurity()
== AccessPoint.SECURITY_OWE_TRANSITION)) {
/** Bypass dialog for unsecured networks */ /** Bypass dialog for unsecured networks */
mSelectedAccessPoint.generateOpenNetworkConfig(); mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig(), isSavedNetwork); connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
@@ -748,7 +750,8 @@ public class WifiSettings extends RestrictedSettingsFragment
preference.setOrder(index); preference.setOrder(index);
if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr()) if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
&& (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE && && (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE &&
accessPoint.getSecurity() != AccessPoint.SECURITY_OWE)) { accessPoint.getSecurity() != AccessPoint.SECURITY_OWE &&
accessPoint.getSecurity() != AccessPoint.SECURITY_OWE_TRANSITION)) {
if (!accessPoint.isSaved() || isDisabledByWrongPassword(accessPoint)) { if (!accessPoint.isSaved() || isDisabledByWrongPassword(accessPoint)) {
onPreferenceTreeClick(preference); onPreferenceTreeClick(preference);
mOpenSsid = null; mOpenSsid = null;

3
src/com/android/settings/wifi/WifiUtils.java
View File

@@ -268,7 +268,8 @@ public class WifiUtils {
if (accessPoint.isOsuProvider()) { if (accessPoint.isOsuProvider()) {
return CONNECT_TYPE_OSU_PROVISION; return CONNECT_TYPE_OSU_PROVISION;
} else if ((accessPoint.getSecurity() == AccessPoint.SECURITY_NONE) || } else if ((accessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
(accessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) { (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE) ||
(accessPoint.getSecurity() == AccessPoint.SECURITY_OWE_TRANSITION)) {
return CONNECT_TYPE_OPEN_NETWORK; return CONNECT_TYPE_OPEN_NETWORK;
} else if (accessPoint.isSaved() && config != null } else if (accessPoint.isSaved() && config != null
&& config.getNetworkSelectionStatus() != null && config.getNetworkSelectionStatus() != null