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

Commit fb83cbb8 authored by Munikrishna J's avatar Munikrishna J Committed by Android (Google) Code Review
Browse files

Merge "Adding multiple proposals of IKE SA and Child SA cipher suits in IWLAN" into main

parents 59defc9e c447f401

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -43742,7 +43742,9 @@ package android.telephony { 
    field public static final String KEY_SUPPORTED_IKE_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY = "iwlan.supported_ike_session_encryption_algorithms_int_array";

    field public static final String KEY_SUPPORTED_INTEGRITY_ALGORITHMS_INT_ARRAY = "iwlan.supported_integrity_algorithms_int_array";

    field public static final String KEY_SUPPORTED_PRF_ALGORITHMS_INT_ARRAY = "iwlan.supported_prf_algorithms_int_array";

    field @FlaggedApi("com.android.internal.telephony.flags.enable_multiple_sa_proposals") public static final String KEY_SUPPORTS_CHILD_SESSION_MULTIPLE_SA_PROPOSALS_BOOL = "iwlan.supports_child_session_multiple_sa_proposals_bool";

    field public static final String KEY_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL = "iwlan.supports_eap_aka_fast_reauth_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.enable_multiple_sa_proposals") public static final String KEY_SUPPORTS_IKE_SESSION_MULTIPLE_SA_PROPOSALS_BOOL = "iwlan.supports_ike_session_multiple_sa_proposals_bool";

  }















  public abstract class CellIdentity implements android.os.Parcelable {

























telephony/java/android/telephony/CarrierConfigManager.java



+20
−0




























Original line number
Diff line number
Diff line








@@ -8852,6 +8852,24 @@ public class CarrierConfigManager {













        public static final String KEY_EPDG_STATIC_ADDRESS_ROAMING_STRING =















                KEY_PREFIX + "epdg_static_address_roaming_string";



























        /**













         * Controls if the multiple SA proposals allowed for IKE session to include













         * all the 3GPP TS 33.210 and RFC 8221 supported cipher suites in multiple













         * IKE SA proposals as per RFC 7296.













         */













        @FlaggedApi(Flags.FLAG_ENABLE_MULTIPLE_SA_PROPOSALS)













        public static final String KEY_SUPPORTS_IKE_SESSION_MULTIPLE_SA_PROPOSALS_BOOL =













                KEY_PREFIX + "supports_ike_session_multiple_sa_proposals_bool";

























        /**













         * Controls if the multiple SA proposals allowed for Child session to include













         * all the 3GPP TS 33.210 and RFC 8221 supported cipher suites in multiple













         * Child SA proposals as per RFC 7296.













         */













        @FlaggedApi(Flags.FLAG_ENABLE_MULTIPLE_SA_PROPOSALS)













        public static final String KEY_SUPPORTS_CHILD_SESSION_MULTIPLE_SA_PROPOSALS_BOOL =













                KEY_PREFIX + "supports_child_session_multiple_sa_proposals_bool";



























        /**















         * List of supported key sizes for AES Cipher Block Chaining (CBC) encryption mode of child















         * session. Possible values are:










@@ -9187,6 +9205,8 @@ public class CarrierConfigManager {













            defaults.putInt(KEY_IKE_REKEY_HARD_TIMER_SEC_INT, 14400);















            defaults.putInt(KEY_CHILD_SA_REKEY_SOFT_TIMER_SEC_INT, 3600);















            defaults.putInt(KEY_CHILD_SA_REKEY_HARD_TIMER_SEC_INT, 7200);













            defaults.putBoolean(KEY_SUPPORTS_IKE_SESSION_MULTIPLE_SA_PROPOSALS_BOOL, false);













            defaults.putBoolean(KEY_SUPPORTS_CHILD_SESSION_MULTIPLE_SA_PROPOSALS_BOOL, false);















            defaults.putIntArray(















                    KEY_RETRANSMIT_TIMER_MSEC_INT_ARRAY, new int[] {500, 1000, 2000, 4000, 8000});















            defaults.putInt(KEY_DPD_TIMER_SEC_INT, 120);