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

Commit ad1862ec authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix WPA3 Suite-B parameters in WifiConfiguration#setSecurityParams"... 

Merge "Fix WPA3 Suite-B parameters in WifiConfiguration#setSecurityParams" into rvc-dev am: d10fd780 am: d65f9bf0 am: 0c99bacb am: 5bab145d

Change-Id: Ia2c5f5e6e7e3b006d4e9532c2979fe97a45c5ccd
parents acef22e1 5bab145d

wifi/java/android/net/wifi/WifiConfiguration.java

+2 −0
Original line number Diff line number Diff line
@@ -503,6 +503,8 @@ public class WifiConfiguration implements Parcelable { 
                break;

            case SECURITY_TYPE_EAP_SUITE_B:

                allowedProtocols.set(WifiConfiguration.Protocol.RSN);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SUITE_B_192);

                allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);

                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);

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

+2 −0
Original line number Diff line number Diff line
@@ -456,6 +456,8 @@ public class WifiConfigurationTest { 
        config.setSecurityParams(SECURITY_TYPE_EAP_SUITE_B);



        assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SUITE_B_192));

        assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP));

        assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X));

        assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.GCMP_256));

        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.GCMP_256));

        assertTrue(config.allowedGroupManagementCiphers