Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bae844a1 authored by Les Lee's avatar Les Lee Committed by Android (Google) Code Review
Browse files

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

parents 25bfb826 43a326cd

wifi/java/android/net/wifi/SoftApConfiguration.java

+1 −0
Original line number Diff line number Diff line
@@ -533,6 +533,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:

wifi/tests/src/android/net/wifi/SoftApConfigurationTest.java

+11 −6
Original line number Diff line number Diff line
@@ -282,12 +282,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
@@ -330,5 +324,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");

    }

}