From ee61c6232e7990c7269656a722b2098315e13c84 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Tue, 19 Apr 2016 16:17:19 -0700 Subject: [PATCH] Add new carrier config option for video conference support. - Default to off. - @hide for now until we know whether we can bump the API rev for the DR. Bug: 27658118 Change-Id: Ie0eda180f0a50b8f7026fce9eac8903f9a82eef5 --- .../java/android/telephony/CarrierConfigManager.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 5ac697f99e18c..2f949b53b67e5 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -523,6 +523,17 @@ public class CarrierConfigManager { */ public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool"; + /** + * Determines whether video conference calls are supported by a carrier. When {@code true}, + * video calls can be merged into conference calls, {@code false} otherwiwse. + *

+ * Note: even if video conference calls are not supported, audio calls may be merged into a + * conference if {@link #KEY_SUPPORT_CONFERENCE_CALL_BOOL} is {@code true}. + * @hide + */ + public static final String KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL = + "support_video_conference_call_bool"; + /** * Determine whether user can toggle Enhanced 4G LTE Mode in Settings. */ @@ -754,6 +765,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_SUPPORT_CONFERENCE_CALL_BOOL, true); + sDefaults.putBoolean(KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false); sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true); sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false); sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);