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

Commit 5279dc35 authored by Eden Su's avatar Eden Su Committed by Android (Google) Code Review
Browse files

Merge "Add carrier config for EAP-AKA fast reauth feature"

parents ccfb317a 9fc998a2

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41702,6 +41702,7 @@ package android.telephony { 
    field public static final String KEY_CHILD_SESSION_AES_CTR_KEY_SIZE_INT_ARRAY = "iwlan.child_session_aes_ctr_key_size_int_array";

    field public static final String KEY_DIFFIE_HELLMAN_GROUPS_INT_ARRAY = "iwlan.diffie_hellman_groups_int_array";

    field public static final String KEY_DPD_TIMER_SEC_INT = "iwlan.dpd_timer_sec_int";

    field public static final String KEY_ENABLE_SUPPORT_FOR_EAP_AKA_FAST_REAUTH_BOOL = "iwlan.enable_support_for_eap_aka_fast_reauth_bool";

    field public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY = "iwlan.epdg_address_priority_int_array";

    field public static final String KEY_EPDG_AUTHENTICATION_METHOD_INT = "iwlan.epdg_authentication_method_int";

    field public static final String KEY_EPDG_PCO_ID_IPV4_INT = "iwlan.epdg_pco_id_ipv4_int";

telephony/java/android/telephony/CarrierConfigManager.java

+5 −0
Original line number Diff line number Diff line
@@ -5036,6 +5036,10 @@ public class CarrierConfigManager { 
        /** Specifies the PCO id for IPv4 Epdg server address */

        public static final String KEY_EPDG_PCO_ID_IPV4_INT = KEY_PREFIX + "epdg_pco_id_ipv4_int";



        /** Controls if the IKE tunnel setup supports EAP-AKA fast reauth */

        public static final String KEY_ENABLE_SUPPORT_FOR_EAP_AKA_FAST_REAUTH_BOOL =

                KEY_PREFIX + "enable_support_for_eap_aka_fast_reauth_bool";



        /** @hide */

        @IntDef({AUTHENTICATION_METHOD_EAP_ONLY, AUTHENTICATION_METHOD_CERT})

        public @interface AuthenticationMethodType {}
@@ -5179,6 +5183,7 @@ public class CarrierConfigManager { 
            defaults.putBoolean(KEY_ADD_KE_TO_CHILD_SESSION_REKEY_BOOL, false);

            defaults.putInt(KEY_EPDG_PCO_ID_IPV6_INT, 0);

            defaults.putInt(KEY_EPDG_PCO_ID_IPV4_INT, 0);

            defaults.putBoolean(KEY_ENABLE_SUPPORT_FOR_EAP_AKA_FAST_REAUTH_BOOL, false);



            return defaults;

        }