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

Commit 476359da 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 

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

Change-Id: Iaa67fcaa275830e51c17847de41293d64874a9d5
parents 71aca9af 55d337b1

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41304,6 +41304,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_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_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL = "iwlan.supports_eap_aka_fast_reauth_bool";

  }















  public abstract class CellIdentity implements android.os.Parcelable {

























telephony/java/android/telephony/CarrierConfigManager.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -4883,6 +4883,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_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL =













                KEY_PREFIX + "supports_eap_aka_fast_reauth_bool";





























        /** @hide */















        @IntDef({AUTHENTICATION_METHOD_EAP_ONLY, AUTHENTICATION_METHOD_CERT})















        public @interface AuthenticationMethodType {}










@@ -5029,6 +5033,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_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL, false);































            return defaults;















        }