diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 95435f794d40..bb24da1e53fa 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41254,6 +41254,7 @@ package android.telephony { field public static final int EPDG_ADDRESS_PCO = 2; // 0x2 field public static final int EPDG_ADDRESS_PLMN = 1; // 0x1 field public static final int EPDG_ADDRESS_STATIC = 0; // 0x0 + field public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4; // 0x4 field public static final int ID_TYPE_FQDN = 2; // 0x2 field public static final int ID_TYPE_KEY_ID = 11; // 0xb field public static final int ID_TYPE_RFC822_ADDR = 3; // 0x3 diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b109c4664a7d..de9773043989 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4724,7 +4724,7 @@ public class CarrierConfigManager { /** * A priority list of ePDG addresses to be used. Possible values are {@link * #EPDG_ADDRESS_STATIC}, {@link #EPDG_ADDRESS_PLMN}, {@link #EPDG_ADDRESS_PCO}, {@link - * #EPDG_ADDRESS_CELLULAR_LOC} + * #EPDG_ADDRESS_CELLULAR_LOC}, {@link #EPDG_ADDRESS_VISITED_COUNTRY} */ public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY = KEY_PREFIX + "epdg_address_priority_int_array"; @@ -4899,7 +4899,8 @@ public class CarrierConfigManager { EPDG_ADDRESS_STATIC, EPDG_ADDRESS_PLMN, EPDG_ADDRESS_PCO, - EPDG_ADDRESS_CELLULAR_LOC + EPDG_ADDRESS_CELLULAR_LOC, + EPDG_ADDRESS_VISITED_COUNTRY }) public @interface EpdgAddressType {} @@ -4913,6 +4914,8 @@ public class CarrierConfigManager { public static final int EPDG_ADDRESS_PCO = 2; /** Use cellular location to chose epdg server */ public static final int EPDG_ADDRESS_CELLULAR_LOC = 3; + /* Use Visited Country FQDN rule*/ + public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4; /** @hide */ @IntDef({ID_TYPE_FQDN, ID_TYPE_RFC822_ADDR, ID_TYPE_KEY_ID}) |