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

Commit b0b89803 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert submission" am: 3b98950a am: 3876ecd5 

Change-Id: I6500ef0a590d63d8c1d07c3c2f096d0d565a15a2
parents 435cf631 3876ecd5

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3566,7 +3566,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);

        sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_MAP_NON_NUMBER_TO_VOICEMAIL_BOOL, false);

        sDefaults.putBoolean(KEY_IGNORE_RTT_MODE_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_IGNORE_RTT_MODE_SETTING_BOOL, false);

        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true);