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

Merge "Add Iwlan ePDG PLMN Priority Config in CarrierConfigManager" am: 029af5ef8e am: e8b138c069

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

Change-Id: Ibdd3257bfa2a0545fde4ccb4f680ce102c7e899d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kuen Yuet Cheung
2023-03-17 08:29:12 +00:00
committed by Automerger Merge Worker
parent 9dd4d9f169 e8b138c069
commit 987c66012a
1 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7880,6 +7880,16 @@ public class CarrierConfigManager {
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";
/**
* 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 */ /** Epdg static IP address or FQDN */
public static final String KEY_EPDG_STATIC_ADDRESS_STRING = public static final String KEY_EPDG_STATIC_ADDRESS_STRING =
KEY_PREFIX + "epdg_static_address_string"; KEY_PREFIX + "epdg_static_address_string";
@@ -8080,6 +8090,36 @@ public class CarrierConfigManager {
/* Use Visited Country FQDN rule*/ /* Use Visited Country FQDN rule*/
public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4; 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 */ /** @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})
public @interface IkeIdType {} public @interface IkeIdType {}
@@ -8215,6 +8255,12 @@ public class CarrierConfigManager {
defaults.putIntArray( defaults.putIntArray(
KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY, KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY,
new int[] {EPDG_ADDRESS_PLMN, EPDG_ADDRESS_STATIC}); 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.putStringArray(KEY_MCC_MNCS_STRING_ARRAY, new String[] {});
defaults.putInt(KEY_IKE_LOCAL_ID_TYPE_INT, ID_TYPE_RFC822_ADDR); defaults.putInt(KEY_IKE_LOCAL_ID_TYPE_INT, ID_TYPE_RFC822_ADDR);
defaults.putInt(KEY_IKE_REMOTE_ID_TYPE_INT, ID_TYPE_FQDN); defaults.putInt(KEY_IKE_REMOTE_ID_TYPE_INT, ID_TYPE_FQDN);