From 10208661cda0c6372d78f7a5bfa063658b62f2be Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Wed, 15 Jun 2016 17:55:00 -0700 Subject: [PATCH] Add disable add call during video call extra and carrier config key Bug: 29047863 Change-Id: I977041ec72968bdccc69a706e27dd4b5ec336ba7 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + telecomm/java/android/telecom/Connection.java | 8 ++++++++ .../java/android/telephony/CarrierConfigManager.java | 7 +++++++ 5 files changed, 18 insertions(+) diff --git a/api/current.txt b/api/current.txt index 53791405683cc..c6316271c6365 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36768,6 +36768,7 @@ package android.telephony { field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; + field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool"; field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool"; diff --git a/api/system-current.txt b/api/system-current.txt index 6a6653357d10b..3fa518a43e49f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -39807,6 +39807,7 @@ package android.telephony { field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; + field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool"; field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool"; diff --git a/api/test-current.txt b/api/test-current.txt index 7642282f4aca2..993f388f15abb 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36846,6 +36846,7 @@ package android.telephony { field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; + field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool"; field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool"; diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 2a0a9a640c6d7..1b14d65b823ca 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -374,6 +374,14 @@ public abstract class Connection extends Conferenceable { public static final String EXTRA_ANSWERING_DROPS_FG_CALL = "android.telecom.extra.ANSWERING_DROPS_FG_CALL"; + /** + * Boolean connection extra key on a {@link Connection} which indicates that adding an + * additional call is disallowed when there is a video call in progress. + * @hide + */ + public static final String EXTRA_DISABLE_ADD_CALL_DURING_VIDEO_CALL = + "android.telecom.extra.DISABLE_ADD_CALL_DURING_VIDEO_CALL"; + /** * Connection event used to inform Telecom that it should play the on hold tone. This is used * to play a tone when the peer puts the current call on hold. Sent to Telecom via diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 8399bb669da00..a5e50aa1ee5db 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -818,6 +818,12 @@ public class CarrierConfigManager { public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool"; + /** + * When true, indicates that adding a call is disabled when there is an ongoing video call. + */ + public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = + "allow_add_call_during_video_call"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -972,6 +978,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_TREAT_DOWNGRADED_VIDEO_CALLS_AS_VIDEO_CALLS_BOOL, false); sDefaults.putBoolean(KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL, false); sDefaults.putBoolean(KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL, true); + sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL, true); } /**