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

Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-19 16:54:35 +00:00
committed by Android (Google) Code Review
parent 0304f4d1ce 751eba205b
commit d8916ef151
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/dpp/WifiDppUtils.java
View File

@@ -205,6 +205,11 @@ public class WifiDppUtils {
final WifiConfiguration wifiConfiguration = accessPoint.getConfig(); final WifiConfiguration wifiConfiguration = accessPoint.getConfig();
setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration); setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);
// For a transition mode Wi-Fi AP, creates a QR code that's compatible with more devices
if (accessPoint.getSecurity() == AccessPoint.SECURITY_PSK_SAE_TRANSITION) {
intent.putExtra(EXTRA_WIFI_SECURITY, WifiQrCode.SECURITY_WPA_PSK);
}
return intent; return intent;
} }
@@ -400,6 +405,7 @@ public class WifiDppUtils {
} }
break; break;
case AccessPoint.SECURITY_PSK: case AccessPoint.SECURITY_PSK:
case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
return true; return true;
default: default:
} }
@@ -412,6 +418,8 @@ public class WifiDppUtils {
case AccessPoint.SECURITY_PSK: case AccessPoint.SECURITY_PSK:
case AccessPoint.SECURITY_WEP: case AccessPoint.SECURITY_WEP:
case AccessPoint.SECURITY_NONE: case AccessPoint.SECURITY_NONE:
case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
case AccessPoint.SECURITY_OWE_TRANSITION:
return true; return true;
case AccessPoint.SECURITY_SAE: case AccessPoint.SECURITY_SAE:
if (wifiManager.isWpa3SaeSupported()) { if (wifiManager.isWpa3SaeSupported()) {