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

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

fix branch break by adding carrierconfig key am: e787323e 

am: 1e1c0603

Change-Id: I0d76442494289c6b920c84a7c07bd635f515da88
parents 3cb327bf 1e1c0603

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -839,6 +839,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.)
@@ -1099,6 +1108,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_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);