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

Commit 28302ca2 authored by Jimmy Chen's avatar Jimmy Chen Committed by Automerger Merge Worker
Browse files

Merge "wifi: create a better name for WPA3 Enterprise 192-bit mode" am: c8b48c97 

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

Change-Id: I086d96165f8ca6206f58b27ea34b90b16643e8e8
parents 28effd8e c8b48c97

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31416,6 +31416,7 @@ package android.net.wifi { 
    field @Deprecated public static final int SECURITY_TYPE_EAP = 3; // 0x3

    field @Deprecated public static final int SECURITY_TYPE_EAP_SUITE_B = 5; // 0x5

    field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9

    field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5; // 0x5

    field @Deprecated public static final int SECURITY_TYPE_OPEN = 0; // 0x0

    field @Deprecated public static final int SECURITY_TYPE_OWE = 6; // 0x6

    field @Deprecated public static final int SECURITY_TYPE_PSK = 2; // 0x2

wifi/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ package android.net.wifi { 
    field @Deprecated public static final int SECURITY_TYPE_EAP = 3; // 0x3

    field @Deprecated public static final int SECURITY_TYPE_EAP_SUITE_B = 5; // 0x5

    field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9

    field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5; // 0x5

    field @Deprecated public static final int SECURITY_TYPE_OPEN = 0; // 0x0

    field @Deprecated public static final int SECURITY_TYPE_OWE = 6; // 0x6

    field @Deprecated public static final int SECURITY_TYPE_PSK = 2; // 0x2

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

+20 −4
Original line number Diff line number Diff line
@@ -439,8 +439,19 @@ public class WifiConfiguration implements Parcelable { 
    public static final int SECURITY_TYPE_EAP = 3;

    /** Security type for an SAE network. */

    public static final int SECURITY_TYPE_SAE = 4;

    /** Security type for an EAP Suite B network. */

    public static final int SECURITY_TYPE_EAP_SUITE_B = 5;

    /**

     * Security type for a WPA3-Enterprise in 192-bit security network.

     * This is the same as {@link #SECURITY_TYPE_EAP_SUITE_B} and uses the same value.

     */

    public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5;

    /**

     * Security type for a WPA3-Enterprise in 192-bit security network.

     * @deprecated Use the {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT} constant

     * (which is the same value).

     */

    @Deprecated

    public static final int SECURITY_TYPE_EAP_SUITE_B =

            SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT;

    /** Security type for an OWE network. */

    public static final int SECURITY_TYPE_OWE = 6;

    /** Security type for a WAPI PSK network. */
@@ -466,6 +477,7 @@ public class WifiConfiguration implements Parcelable { 
            SECURITY_TYPE_WAPI_PSK,

            SECURITY_TYPE_WAPI_CERT,

            SECURITY_TYPE_EAP_WPA3_ENTERPRISE,

            SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT,

    })

    public @interface SecurityType {}
@@ -483,7 +495,8 @@ public class WifiConfiguration implements Parcelable { 
     * {@link #SECURITY_TYPE_OWE},

     * {@link #SECURITY_TYPE_WAPI_PSK},

     * {@link #SECURITY_TYPE_WAPI_CERT},

     * {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE}

     * {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE},

     * {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT}

     */

    public void setSecurityParams(@SecurityType int securityType) {

        // Clear all the bitsets.
@@ -522,7 +535,10 @@ public class WifiConfiguration implements Parcelable { 
                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);

                requirePmf = true;

                break;

            case SECURITY_TYPE_EAP_SUITE_B:

            // The value of {@link SECURITY_TYPE_EAP_SUITE_B} is the same as

            // {@link SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT}, remove it to avoid

            // duplicate case label errors.

            case SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT:

                allowedProtocols.set(WifiConfiguration.Protocol.RSN);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X);

wifi/java/android/net/wifi/WifiNetworkSpecifier.java

+4 −2
Original line number Diff line number Diff line
@@ -367,10 +367,12 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc 
                        && WifiEnterpriseConfig.isSuiteBCipherCert(

                        mWpa3EnterpriseConfig.getCaCertificate())) {

                    // WPA3-Enterprise in 192-bit security mode

                    configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);

                    configuration.setSecurityParams(

                            WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);

                } else if (mWpa3EnterpriseType == WPA3_ENTERPRISE_192_BIT) {

                    // WPA3-Enterprise in 192-bit security mode

                    configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);

                    configuration.setSecurityParams(

                            WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);

                } else {

                    // WPA3-Enterprise

                    configuration.setSecurityParams(

wifi/java/android/net/wifi/WifiNetworkSuggestion.java

+4 −2
Original line number Diff line number Diff line
@@ -796,10 +796,12 @@ public final class WifiNetworkSuggestion implements Parcelable { 
                        && WifiEnterpriseConfig.isSuiteBCipherCert(

                        mWpa3EnterpriseConfig.getCaCertificate())) {

                    // WPA3-Enterprise in 192-bit security mode

                    configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);

                    configuration.setSecurityParams(

                            WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);

                } else if (mWpa3EnterpriseType == WPA3_ENTERPRISE_192_BIT) {

                    // WPA3-Enterprise in 192-bit security mode

                    configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);

                    configuration.setSecurityParams(

                            WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);

                } else {

                    // WPA3-Enterprise

                    configuration.setSecurityParams(