From d91518e463023f1e9cc703189fbc5e8f3e87b0b3 Mon Sep 17 00:00:00 2001 From: Hyunho Date: Wed, 4 May 2022 22:45:01 +0000 Subject: [PATCH 1/2] add use_tel_uri_for_pidf_xml field for ATT-UCE 430 Add use_tel_uri_for_pidf_xml field for ATT-UCE 430 Set the added filed to false by defaut and true for ATT If the field is true, get the first TEL URI from associated uris. Bug: b/229669620 Test: PUBLISH - 200OK in the live network Test: Set SIP and TEL URI to assoicated uris. Check whether the URI of the desired scheme is read according to the field value. Change-Id: I5751c94904734514faf5b4c3c1545c40ed6e7dd5 Merged-In: I5751c94904734514faf5b4c3c1545c40ed6e7dd5 --- .../android/telephony/CarrierConfigManager.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e21301eb32af1..dba18fda31d31 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4979,6 +4979,20 @@ public class CarrierConfigManager { public static final String KEY_USE_SIP_URI_FOR_PRESENCE_SUBSCRIBE_BOOL = KEY_PREFIX + "use_sip_uri_for_presence_subscribe_bool"; + /** + * Flag indicating whether or not to use TEL URI when setting the entity uri field and + * contact element of each tuple. + * When {@code true}, the device sets the entity uri field and contact element to be + * TEL URI. + * If the TEL URI does not exist, the first URI provided in p-associated-uri header is + * converted into a TEL URI. + * If {@code false}, if false, the first URI provided in the p-associated-uri header + * is used. + * @hide + */ + public static final String KEY_USE_TEL_URI_FOR_PIDF_XML_BOOL = + KEY_PREFIX + "use_tel_uri_for_pidf_xml"; + /** * An integer key associated with the period of time in seconds the non-rcs capability * information of each contact is cached on the device. From 6c486203150811f9528fc508bce225442a2c9c9d Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Fri, 6 May 2022 11:26:12 -0700 Subject: [PATCH 2/2] Clarify KEY_USE_TEL_URI_FOR_PIDF_XML_BOOL documentation Bug: b/229669620 Test: atest ImsCommonTests; manual validation of PUBLISH 200 OK Change-Id: I18c6c6dc6683c13d354252b6df47f126cea3288c --- .../android/telephony/CarrierConfigManager.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index dba18fda31d31..70fe6b10ef20c 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4982,12 +4982,17 @@ public class CarrierConfigManager { /** * Flag indicating whether or not to use TEL URI when setting the entity uri field and * contact element of each tuple. + * * When {@code true}, the device sets the entity uri field and contact element to be + * TEL URI. This is done by first searching for the first TEL URI provided in + * p-associated-uri header. If there are no TEL URIs in the p-associated-uri header, we will + * convert the first SIP URI provided in the header to a TEL URI. If there are no URIs in + * the p-associated-uri header, we will then fall back to using the SIM card to generate the * TEL URI. - * If the TEL URI does not exist, the first URI provided in p-associated-uri header is - * converted into a TEL URI. - * If {@code false}, if false, the first URI provided in the p-associated-uri header - * is used. + * If {@code false}, the first URI provided in the p-associated-uri header is used, + * independent of the URI scheme. If there are no URIs available from p-associated-uri + * header, we will try to generate a SIP URI or TEL URI from the information provided by the + * SIM card, depending on the information available. * @hide */ public static final String KEY_USE_TEL_URI_FOR_PIDF_XML_BOOL =