diff options
| author | Hai Shalom <haishalom@google.com> | 2018-10-15 16:14:04 -0700 |
|---|---|---|
| committer | Hai Shalom <haishalom@google.com> | 2018-11-06 11:09:12 -0800 |
| commit | 4a1a1513fcd2846f914f3134eb8db81e59073a2c (patch) | |
| tree | eb86c26a3269817f5640b5fe95321e6cde55bb6f /service/java/com/android/server/wifi/WifiConfigManager.java | |
| parent | d2a20c1a3975668bc5aeab53a8f0daae6662366a (diff) | |
| download | android_frameworks_opt_net_wifi-4a1a1513fcd2846f914f3134eb8db81e59073a2c.tar.gz android_frameworks_opt_net_wifi-4a1a1513fcd2846f914f3134eb8db81e59073a2c.tar.bz2 android_frameworks_opt_net_wifi-4a1a1513fcd2846f914f3134eb8db81e59073a2c.zip | |
opt/net/wifi: Add support for WPA3 and OWE
Add support for WPA3-Personal (SAE), WPA3-Enterprise (SuiteB) and OWE
(Enhanced Open). Changes include new types and new methods.
Bug: 112195778
Test: atest com.android.server.wifi
Change-Id: I5c1520bd951cd4b6110f573e3522073dec6e910a
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 98fb945af..8c40c6a13 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -822,6 +822,8 @@ public class WifiConfigManager { internalConfig.BSSID = externalConfig.BSSID.toLowerCase(); } internalConfig.hiddenSSID = externalConfig.hiddenSSID; + internalConfig.requirePMF = externalConfig.requirePMF; + if (externalConfig.preSharedKey != null && !externalConfig.preSharedKey.equals(PASSWORD_MASK)) { internalConfig.preSharedKey = externalConfig.preSharedKey; @@ -877,6 +879,16 @@ public class WifiConfigManager { internalConfig.allowedGroupCiphers = (BitSet) externalConfig.allowedGroupCiphers.clone(); } + if (externalConfig.allowedGroupMgmtCiphers != null + && !externalConfig.allowedGroupMgmtCiphers.isEmpty()) { + internalConfig.allowedGroupMgmtCiphers = + (BitSet) externalConfig.allowedGroupMgmtCiphers.clone(); + } + if (externalConfig.allowedSuiteBCiphers != null + && !externalConfig.allowedSuiteBCiphers.isEmpty()) { + internalConfig.allowedSuiteBCiphers = + (BitSet) externalConfig.allowedSuiteBCiphers.clone(); + } // Copy over the |IpConfiguration| parameters if set. if (externalConfig.getIpConfiguration() != null) { |