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

Commit 53704b31 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "fix branch break by adding carrierconfig key" into stage-aosp-master

parents 86cdc8f3 e787323e

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -720,6 +720,15 @@ public class CarrierConfigManager { 
    public static final String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT =

            "duration_blocking_disabled_after_emergency_int";



    /**

     * For carriers which require an empty flash to be sent before sending the normal 3-way calling

     * flash, the duration in milliseconds of the empty flash to send.  When {@code 0}, no empty

     * flash is sent.

     * @hide

     */

    public static final String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";





    /**

     * @hide

     * The default value for preferred CDMA roaming mode (aka CDMA system select.)
@@ -829,6 +838,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0);

        sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);

        sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);

        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);

        sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);