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

Merge "wifi: Support SAE_TRANSITION when converting to WifiConfiguration" into rvc-qpr-dev am: bae844a14d am: fb4a3fc115

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12360937

Change-Id: I8f449394698cf25a093e4ca0c8de495a900b27d7
This commit is contained in:
Les Lee
2020-08-14 05:58:10 +00:00
committed by Automerger Merge Worker
parent 7a5be5533b fb4a3fc115
commit 6c1cf6ccd8
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/java/android/net/wifi/SoftApConfiguration.java
View File

@@ -582,6 +582,7 @@ public final class SoftApConfiguration implements Parcelable {
wifiConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
break;
case SECURITY_TYPE_WPA2_PSK:
case SECURITY_TYPE_WPA3_SAE_TRANSITION:
wifiConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
break;
default:

17
wifi/tests/src/android/net/wifi/SoftApConfigurationTest.java
View File

@@ -310,12 +310,6 @@ public class SoftApConfigurationTest {
.build();
assertNull(band_6g_config.toWifiConfiguration());
SoftApConfiguration sae_transition_config = new SoftApConfiguration.Builder()
.setPassphrase("secretsecret",
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)
.build();
assertNull(sae_transition_config.toWifiConfiguration());
}
@Test
@@ -358,5 +352,16 @@ public class SoftApConfigurationTest {
assertThat(wifiConfig_2g5g.apBand).isEqualTo(WifiConfiguration.AP_BAND_ANY);
assertThat(wifiConfig_2g5g.apChannel).isEqualTo(0);
assertThat(wifiConfig_2g5g.hiddenSSID).isEqualTo(true);
SoftApConfiguration softApConfig_sae_transition = new SoftApConfiguration.Builder()
.setPassphrase("secretsecret",
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)
.build();
WifiConfiguration wifiConfig_sae_transition =
softApConfig_sae_transition.toWifiConfiguration();
assertThat(wifiConfig_sae_transition.getAuthType())
.isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
assertThat(wifiConfig_sae_transition.preSharedKey).isEqualTo("secretsecret");
}
}