diff options
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index c175fc635e5c..36362f7304ab 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -7880,6 +7880,16 @@ public class CarrierConfigManager { public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY = KEY_PREFIX + "epdg_address_priority_int_array"; + /** + * A priority list of PLMN to be used in EPDG_ADDRESS_PLMN. Possible values are {@link + * #EPDG_PLMN_RPLMN}, {@link #EPDG_PLMN_HPLMN}, {@link #EPDG_PLMN_EHPLMN_ALL}, {@link + * #EPDG_PLMN_EHPLMN_FIRST} + * + * @hide + */ + public static final String KEY_EPDG_PLMN_PRIORITY_INT_ARRAY = + KEY_PREFIX + "epdg_plmn_priority_int_array"; + /** Epdg static IP address or FQDN */ public static final String KEY_EPDG_STATIC_ADDRESS_STRING = KEY_PREFIX + "epdg_static_address_string"; @@ -8081,6 +8091,36 @@ public class CarrierConfigManager { public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4; /** @hide */ + @IntDef({ + EPDG_PLMN_RPLMN, + EPDG_PLMN_HPLMN, + EPDG_PLMN_EHPLMN_ALL, + EPDG_PLMN_EHPLMN_FIRST + }) + public @interface EpdgAddressPlmnType {} + + /** + * Use the Registered PLMN + * @hide + */ + public static final int EPDG_PLMN_RPLMN = 0; + /** + * Use the PLMN derived from IMSI + * @hide + */ + public static final int EPDG_PLMN_HPLMN = 1; + /** + * Use all EHPLMN from SIM EF files + * @hide + */ + public static final int EPDG_PLMN_EHPLMN_ALL = 2; + /** + * Use the first EHPLMN from SIM EF files + * @hide + */ + public static final int EPDG_PLMN_EHPLMN_FIRST = 3; + + /** @hide */ @IntDef({ID_TYPE_FQDN, ID_TYPE_RFC822_ADDR, ID_TYPE_KEY_ID}) public @interface IkeIdType {} @@ -8215,6 +8255,12 @@ public class CarrierConfigManager { defaults.putIntArray( KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY, new int[] {EPDG_ADDRESS_PLMN, EPDG_ADDRESS_STATIC}); + defaults.putIntArray( + KEY_EPDG_PLMN_PRIORITY_INT_ARRAY, + new int[]{ + EPDG_PLMN_RPLMN, + EPDG_PLMN_HPLMN, + EPDG_PLMN_EHPLMN_ALL}); defaults.putStringArray(KEY_MCC_MNCS_STRING_ARRAY, new String[] {}); defaults.putInt(KEY_IKE_LOCAL_ID_TYPE_INT, ID_TYPE_RFC822_ADDR); defaults.putInt(KEY_IKE_REMOTE_ID_TYPE_INT, ID_TYPE_FQDN); |