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

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

Change-Id: If25400b053a00679b5ebc28945701090468f83ad
This commit is contained in:
Les Lee
2020-08-14 05:43:39 +00:00
committed by Automerger Merge Worker
parent 6f148d8f36 bae844a14d
commit fb4a3fc115
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

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

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

@@ -282,12 +282,6 @@ public class SoftApConfigurationTest {
.build(); .build();
assertNull(band_6g_config.toWifiConfiguration()); 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 @Test
@@ -330,5 +324,16 @@ public class SoftApConfigurationTest {
assertThat(wifiConfig_2g5g.apBand).isEqualTo(WifiConfiguration.AP_BAND_ANY); assertThat(wifiConfig_2g5g.apBand).isEqualTo(WifiConfiguration.AP_BAND_ANY);
assertThat(wifiConfig_2g5g.apChannel).isEqualTo(0); assertThat(wifiConfig_2g5g.apChannel).isEqualTo(0);
assertThat(wifiConfig_2g5g.hiddenSSID).isEqualTo(true); 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");
} }
} }