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

Commit d8c719e8 authored by Thomas Stuart's avatar Thomas Stuart Committed by Automerger Merge Worker
Browse files

Merge "route dial out strings to the same number based on service state" into... 

Merge "route dial out strings to the same number based on service state" into tm-dev am: 5f90df83 am: 576ab4a9

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



Change-Id: If9b645b7faf856f8fd3476061eb79e0aef162062
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ac2e095 576ab4a9

telephony/java/android/telephony/CarrierConfigManager.java

+12 −0
Original line number Diff line number Diff line
@@ -831,6 +831,17 @@ public class CarrierConfigManager { 
    public static final String KEY_DIAL_STRING_REPLACE_STRING_ARRAY =

            "dial_string_replace_string_array";



    /**

     * Specifies a map from dialstrings to replacements for international roaming network service

     * numbers which cannot be replaced on the carrier side.

     * <p>

     * Individual entries have the format:

     * [dialstring to replace]:[replacement]

     * @hide

     */

    public static final String KEY_INTERNATIONAL_ROAMING_DIAL_STRING_REPLACE_STRING_ARRAY =

            "international_roaming_dial_string_replace_string_array";



    /**

     * Flag specifying whether WFC over IMS supports the "wifi only" option.  If false, the wifi

     * calling settings will not include an option for "wifi only".  If true, the wifi calling
@@ -8713,6 +8724,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_DIAL_STRING_REPLACE_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_INTERNATIONAL_ROAMING_DIAL_STRING_REPLACE_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false);

        sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0);

        sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);