Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier config for Visited Country FQDN" am: 2bc805e26d am: 5b300d7b7a

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

Change-Id: I21d741496123156b31e9aa437f58de779fad07e5
This commit is contained in:
Eden Su
2022-01-13 08:33:03 +00:00
committed by Automerger Merge Worker
parent ed6378433f 5b300d7b7a
commit 4d96babec1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -41254,6 +41254,7 @@ package android.telephony {
field public static final int EPDG_ADDRESS_PCO = 2; // 0x2 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_PLMN = 1; // 0x1
field public static final int EPDG_ADDRESS_STATIC = 0; // 0x0 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_FQDN = 2; // 0x2
field public static final int ID_TYPE_KEY_ID = 11; // 0xb field public static final int ID_TYPE_KEY_ID = 11; // 0xb
field public static final int ID_TYPE_RFC822_ADDR = 3; // 0x3 field public static final int ID_TYPE_RFC822_ADDR = 3; // 0x3

7
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -4724,7 +4724,7 @@ public class CarrierConfigManager {
/** /**
* A priority list of ePDG addresses to be used. Possible values are {@link * 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_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 = public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY =
KEY_PREFIX + "epdg_address_priority_int_array"; KEY_PREFIX + "epdg_address_priority_int_array";
@@ -4899,7 +4899,8 @@ public class CarrierConfigManager {
EPDG_ADDRESS_STATIC, EPDG_ADDRESS_STATIC,
EPDG_ADDRESS_PLMN, EPDG_ADDRESS_PLMN,
EPDG_ADDRESS_PCO, EPDG_ADDRESS_PCO,
EPDG_ADDRESS_CELLULAR_LOC EPDG_ADDRESS_CELLULAR_LOC,
EPDG_ADDRESS_VISITED_COUNTRY
}) })
public @interface EpdgAddressType {} public @interface EpdgAddressType {}
@@ -4913,6 +4914,8 @@ public class CarrierConfigManager {
public static final int EPDG_ADDRESS_PCO = 2; public static final int EPDG_ADDRESS_PCO = 2;
/** Use cellular location to chose epdg server */ /** Use cellular location to chose epdg server */
public static final int EPDG_ADDRESS_CELLULAR_LOC = 3; public static final int EPDG_ADDRESS_CELLULAR_LOC = 3;
/* Use Visited Country FQDN rule*/
public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4;
/** @hide */ /** @hide */
@IntDef({ID_TYPE_FQDN, ID_TYPE_RFC822_ADDR, ID_TYPE_KEY_ID}) @IntDef({ID_TYPE_FQDN, ID_TYPE_RFC822_ADDR, ID_TYPE_KEY_ID})