From e787323e030600f3556fba0950ed5de680cc4e77 Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Wed, 7 Sep 2016 12:01:24 -0700 Subject: fix branch break by adding carrierconfig key Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to CarrierConfigManager Bug: 29873049 Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0 --- telephony/java/android/telephony/CarrierConfigManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 77b562d34b05..3fc945a83617 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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); -- cgit v1.2.3-59-g8ed1b