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

Commit 5a1cad4f authored by Joonhun Shin's avatar Joonhun Shin Committed by Automerger Merge Worker
Browse files

Merge "add KEY_IGNORE_GLOBAL_PHONE_NUMBER_FORMAT_BOOL" into udc-qpr-dev am:... 

Merge "add KEY_IGNORE_GLOBAL_PHONE_NUMBER_FORMAT_BOOL" into udc-qpr-dev am: 5e49928b am: 7c7638c3

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



Change-Id: I1d81b718b7d5d0b9add3ae671e3c9203d68d3644
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e828d6bb 7c7638c3

telephony/java/android/telephony/CarrierConfigManager.java

+17 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.telephony.ims.MediaQualityStatus; 
import android.telephony.ims.RcsUceAdapter;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.feature.RcsFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;



import com.android.internal.telephony.ICarrierConfigLoader;

import com.android.telephony.Rlog;
@@ -5820,6 +5819,21 @@ public class CarrierConfigManager { 
         */

        public static final int NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED = 3;



        /**

         * This specifies whether the carrier support the global number format or not.

         * {@link SubscriptionManager#getPhoneNumber(int)},

         * {@link SubscriptionManager#getPhoneNumber(int, int)} with

         * {@link SubscriptionManager#PHONE_NUMBER_SOURCE_IMS}

         * In order to provide the phone number to the APIs, the framework extracts the phone

         * number from the message received from the carrier server. If the carrier does not use

         * global number format, the framework could not provide phone number.

         * <p>

         * If not set or set to false value, the framework handle only global number format URI.

         * @hide

         */

        public static final String KEY_ALLOW_NON_GLOBAL_PHONE_NUMBER_FORMAT_BOOL =

                KEY_PREFIX + "allow_non_global_phone_number_format_bool";



        private Ims() {}



        private static PersistableBundle getDefaults() {
@@ -5932,6 +5946,8 @@ public class CarrierConfigManager { 
            defaults.putString(KEY_IMS_USER_AGENT_STRING,

                               "#MANUFACTURER#_#MODEL#_Android#AV#_#BUILD#");



            defaults.putBoolean(KEY_ALLOW_NON_GLOBAL_PHONE_NUMBER_FORMAT_BOOL, false);



            return defaults;

        }

    }