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

Commit d032afed authored by Eden Su's avatar Eden Su Committed by Automerger Merge Worker
Browse files

Merge "Add carrier config for EAP-AKA fast reauth feature" am: 55d337b1 am:... 

Merge "Add carrier config for EAP-AKA fast reauth feature" am: 55d337b1 am: 476359da am: e9973e0c am: ead674f8

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

Change-Id: If8bc234e7ee370209e5cc9d7567009505e3c3bfd
parents 78c2d1a8 ead674f8

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -42348,6 +42348,7 @@ 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_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_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 public static final String KEY_SUPPORTED_PRF_ALGORITHMS_INT_ARRAY = "iwlan.supported_prf_algorithms_int_array";

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

  }

  }

















  public abstract class CellIdentity implements android.os.Parcelable {







  public abstract class CellIdentity implements android.os.Parcelable {

























telephony/java/android/telephony/CarrierConfigManager.java



+5
−0




























Original line number
Original line
Diff line number
Diff line








@@ -7572,6 +7572,10 @@ public class CarrierConfigManager {









        /** Specifies the PCO id for IPv4 Epdg server address */







        /** 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";







        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_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL =














                KEY_PREFIX + "supports_eap_aka_fast_reauth_bool";


























        /** @hide */







        /** @hide */











        @IntDef({AUTHENTICATION_METHOD_EAP_ONLY, AUTHENTICATION_METHOD_CERT})







        @IntDef({AUTHENTICATION_METHOD_EAP_ONLY, AUTHENTICATION_METHOD_CERT})











        public @interface AuthenticationMethodType {}







        public @interface AuthenticationMethodType {}










@@ -7718,6 +7722,7 @@ public class CarrierConfigManager {









            defaults.putBoolean(KEY_ADD_KE_TO_CHILD_SESSION_REKEY_BOOL, false);







            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_IPV6_INT, 0);











            defaults.putInt(KEY_EPDG_PCO_ID_IPV4_INT, 0);







            defaults.putInt(KEY_EPDG_PCO_ID_IPV4_INT, 0);














            defaults.putBoolean(KEY_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL, false);































            return defaults;







            return defaults;











        }







        }