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

Merge changes from topics "ATT-UCE 430", "fix-uce-430" into tm-dev am: 455e490d94

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

Change-Id: I6ac8e9d9b3d39a8fc465cfeefe25e7ea1982c9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Ebinger
2022-05-07 00:20:58 +00:00
committed by Automerger Merge Worker
parent 5540abaf20 455e490d94
commit 07823459c6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4982,12 +4982,17 @@ public class CarrierConfigManager {
/** /**
* Flag indicating whether or not to use TEL URI when setting the entity uri field and * Flag indicating whether or not to use TEL URI when setting the entity uri field and
* contact element of each tuple. * contact element of each tuple.
*
* When {@code true}, the device sets the entity uri field and contact element to be * 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. * TEL URI.
* If the TEL URI does not exist, the first URI provided in p-associated-uri header is * If {@code false}, the first URI provided in the p-associated-uri header is used,
* converted into a TEL URI. * independent of the URI scheme. If there are no URIs available from p-associated-uri
* If {@code false}, if false, the first URI provided in the p-associated-uri header * header, we will try to generate a SIP URI or TEL URI from the information provided by the
* is used. * SIM card, depending on the information available.
* @hide * @hide
*/ */
public static final String KEY_USE_TEL_URI_FOR_PIDF_XML_BOOL = public static final String KEY_USE_TEL_URI_FOR_PIDF_XML_BOOL =