Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c28d5844 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Add SIP configration Bundle keys for UA and CNI 

Adds IMS SIP configuration bundle keys for User-Agent and
Cellular-Network-Info headers required by some networks.

Bug: 178606181
Test: atest CtsTelephonyTestCases:SipDelegateManagerTest
Change-Id: I389162ca0c6348580f6ee8bb6ce5ee3a4e84595e
parent 11dff58d

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -11802,6 +11802,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";
@@ -11834,6 +11835,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";

  }

telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java

+17 −1
Original line number Diff line number Diff line
@@ -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)