diff options
| author | 2021-02-02 19:35:38 +0000 | |
|---|---|---|
| committer | 2021-02-02 19:35:38 +0000 | |
| commit | 72a11d73e71f01b947572bb49b5ef2f8a8cc35d9 (patch) | |
| tree | 8c7f1bf291c2ba03f4ae65c2164df82990a9759c | |
| parent | 6292565f13b42649044a52a406f4de370156666c (diff) | |
| parent | e053159612920728988ead21ace603af8fe397ef (diff) | |
Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507 am: d1a4eec020 am: e053159612
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I275dd58da64367ebfdde3ee53a32f4067e636af0
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index b748b918d1c6..c8d5a6b52dd2 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -13353,6 +13353,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"; @@ -13385,6 +13386,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"; } diff --git a/telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java b/telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java index eddbb1002f20..8762b6a712f2 100644 --- a/telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java +++ b/telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java @@ -280,6 +280,12 @@ public final class SipDelegateImsConfiguration implements Parcelable { "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 */ public static final String KEY_SIP_CONFIG_URI_USER_PART_STRING = @@ -292,12 +298,20 @@ 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 */ public static final String KEY_SIP_CONFIG_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) |