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

Commit d787d17d authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Id5c04b3245317f1e90c191271b201e28fded595c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7162166a 455e490d

telephony/java/android/telephony/CarrierConfigManager.java

+9 −4
Original line number Diff line number Diff line
@@ -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 =