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

Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie115198f4e69bf4cd270980315bfc9a98e522e87
This commit is contained in:
Brad Ebinger
2021-02-02 18:49:23 +00:00
committed by Automerger Merge Worker
parent 36adf13e62 5c389e2507
commit d1a4eec020
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -11962,6 +11962,7 @@ package android.telephony.ims {
field public static final String IPTYPE_IPV6 = "IPV6";
field public static final String KEY_SIP_CONFIG_AUTHENTICATION_HEADER_STRING = "sip_config_auhentication_header_string";
field public static final String KEY_SIP_CONFIG_AUTHENTICATION_NONCE_STRING = "sip_config_authentication_nonce_string";
field public static final String KEY_SIP_CONFIG_CELLULAR_NETWORK_INFO_HEADER_STRING = "sip_config_cellular_network_info_header_string";
field public static final String KEY_SIP_CONFIG_HOME_DOMAIN_STRING = "sip_config_home_domain_string";
field public static final String KEY_SIP_CONFIG_IMEI_STRING = "sip_config_imei_string";
field public static final String KEY_SIP_CONFIG_IPTYPE_STRING = "sip_config_iptype_string";
@@ -11994,6 +11995,7 @@ package android.telephony.ims {
field public static final String KEY_SIP_CONFIG_UE_PUBLIC_PORT_WITH_NAT_INT = "sip_config_ue_public_port_with_nat_int";
field public static final String KEY_SIP_CONFIG_UE_PUBLIC_USER_ID_STRING = "sip_config_ue_public_user_id_string";
field public static final String KEY_SIP_CONFIG_URI_USER_PART_STRING = "sip_config_uri_user_part_string";
field public static final String KEY_SIP_CONFIG_USER_AGENT_HEADER_STRING = "sip_config_sip_user_agent_header_string";
field public static final String SIP_TRANSPORT_TCP = "TCP";
field public static final String SIP_TRANSPORT_UDP = "UDP";
}

18
telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java
View File

@@ -279,6 +279,12 @@ public final class SipDelegateImsConfiguration implements Parcelable {
public static final String KEY_SIP_CONFIG_PATH_HEADER_STRING =
"sip_config_path_header_string";
/**
* The SIP User-Agent header value used by the IMS stack during IMS registration.
*/
public static final String KEY_SIP_CONFIG_USER_AGENT_HEADER_STRING =
"sip_config_sip_user_agent_header_string";
/**
* SIP User part string in contact header
*/
@@ -292,11 +298,19 @@ public final class SipDelegateImsConfiguration implements Parcelable {
"sip_config_p_access_network_info_header_string";
/**
* SIP P-last-access-network-info header string
* The SIP P-last-access-network-info header value, populated for networks that require this
* information to be provided in outgoing SIP messages.
*/
public static final String KEY_SIP_CONFIG_P_LAST_ACCESS_NETWORK_INFO_HEADER_STRING =
"sip_config_p_last_access_network_info_header_string";
/**
* The Cellular-Network-Info header value (See 3GPP 24.229, section 7.2.15), populated for
* networks that require this information to be provided as part of outgoing SIP messages.
*/
public static final String KEY_SIP_CONFIG_CELLULAR_NETWORK_INFO_HEADER_STRING =
"sip_config_cellular_network_info_header_string";
/**
* SIP P-associated-uri header string
*/
@@ -320,9 +334,11 @@ public final class SipDelegateImsConfiguration implements Parcelable {
KEY_SIP_CONFIG_SERVICE_ROUTE_HEADER_STRING,
KEY_SIP_CONFIG_SECURITY_VERIFY_HEADER_STRING,
KEY_SIP_CONFIG_PATH_HEADER_STRING,
KEY_SIP_CONFIG_USER_AGENT_HEADER_STRING,
KEY_SIP_CONFIG_URI_USER_PART_STRING,
KEY_SIP_CONFIG_P_ACCESS_NETWORK_INFO_HEADER_STRING,
KEY_SIP_CONFIG_P_LAST_ACCESS_NETWORK_INFO_HEADER_STRING,
KEY_SIP_CONFIG_CELLULAR_NETWORK_INFO_HEADER_STRING,
KEY_SIP_CONFIG_P_ASSOCIATED_URI_HEADER_STRING
})
@Retention(RetentionPolicy.SOURCE)