Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Wi-Fi] Support transition mode in AccessPoint#matches" into qt-dev

Browse Source 
am: 1b9e062d24

Change-Id: Iaf41c20d4bb6192c537a7fd351813105aab56e3a
This commit is contained in:
Arc Wang
2019-06-19 10:14:50 -07:00
committed by android-build-merger
parent aed835f086 1b9e062d24
commit 0bb4d7d715
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -712,11 +712,25 @@ public class AccessPoint implements Comparable<AccessPoint> {
public boolean matches(WifiConfiguration config) {
if (config.isPasspoint()) {
return (isPasspoint() && config.FQDN.equals(mConfig.FQDN));
} else {
// Normal non-Passpoint network
return ssid.equals(removeDoubleQuotes(config.SSID))
&& security == getSecurity(config)
&& (mConfig == null || mConfig.shared == config.shared);
}
if (!ssid.equals(removeDoubleQuotes(config.SSID))
|| (mConfig != null && mConfig.shared != config.shared)) {
return false;
}
final int configSecurity = getSecurity(config);
final WifiManager wifiManager = getWifiManager();
switch (security) {
case SECURITY_PSK_SAE_TRANSITION:
return configSecurity == SECURITY_PSK
|| (wifiManager.isWpa3SaeSupported() && configSecurity == SECURITY_SAE);
case SECURITY_OWE_TRANSITION:
return configSecurity == SECURITY_NONE
|| (wifiManager.isEnhancedOpenSupported()
&& configSecurity == SECURITY_OWE);
default:
return security == configSecurity;
}
}