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

Commit 180aadfb authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add dial_string_replace key to CarrierConfig" am: 715903f3 am: 9fba74dd 

am: d34ae93d

Change-Id: I6753d00b4d9fed455cb153294f956cf3ad9f826f
parents c4444752 d34ae93d

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2284,6 +2284,10 @@ 
    <string-array translatable="false" name="dial_string_replace">

    </string-array>



    <!-- Flag indicating whether radio is to be restarted on the error of

         PDP_FAIL_REGULAR_DEACTIVATION/0x24 -->

    <bool name="config_restart_radio_on_pdp_fail_regular_deactivation">false</bool>



    <!-- networks that don't want data deactivate when shutdown the phone

         note this is dependent on the operator of the network we're on,

         not operator on the SIM -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2268,6 +2268,7 @@ 
  <java-symbol type="attr" name="windowBackgroundFallback" />

  <java-symbol type="id" name="textSpacerNoButtons" />

  <java-symbol type="array" name="dial_string_replace" />

  <java-symbol type="bool" name="config_restart_radio_on_pdp_fail_regular_deactivation" />

  <java-symbol type="array" name="networks_not_clear_data" />

  <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" />

  <java-symbol type="string" name="whichHomeApplicationNamed" />

telephony/java/android/telephony/CarrierConfigManager.java

+12 −0
Original line number Diff line number Diff line
@@ -284,6 +284,17 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";



    /**

     * Specifies a map from dialstrings to replacements for 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_DIAL_STRING_REPLACE_STRING_ARRAY =

            "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
@@ -1083,6 +1094,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);

        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.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);