From be363243eb610558f9036f0747b0fe4ba9efa898 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Wed, 12 Feb 2020 13:50:46 -0800 Subject: [PATCH] Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL. Per API feedback, rename to KEY_ALLOW_HOLD_VIDEO_CALL_BOOL and update the API docs for clarity. Test: Rebuild code. Test: Run telephony unit tests. Bug: 149299319 Change-Id: I36574865829951a3561f6445e3e83c78c48c4573 --- api/current.txt | 2 +- .../android/telephony/CarrierConfigManager.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index 6b90fbb1c4109..cb98c9036c893 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44697,8 +44697,8 @@ package android.telephony { field public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call"; field public static final String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; field public static final String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool"; - field public static final String KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL = "allow_holding_video_call"; field public static final String KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL = "allow_hold_call_during_emergency_bool"; + field public static final String KEY_ALLOW_HOLD_VIDEO_CALL_BOOL = "allow_hold_video_call_bool"; field public static final String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool"; field public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool"; field public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 382313304611b..1ec3e58605754 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1957,10 +1957,15 @@ public class CarrierConfigManager { "allow_add_call_during_video_call"; /** - * When false, indicates that holding a video call is disabled + * When {@code true}, indicates that video calls can be put on hold in order to swap to another + * call (e.g. a new outgoing call). + * When {@code false}, indicates that video calls will be disconnected when swapping to another + * call. + *

+ * This is {@code true} by default. */ - public static final String KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL = - "allow_holding_video_call"; + public static final String KEY_ALLOW_HOLD_VIDEO_CALL_BOOL = + "allow_hold_video_call_bool"; /** * When true, indicates that the HD audio icon in the in-call screen should not be shown for @@ -3704,7 +3709,7 @@ public class CarrierConfigManager { 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); - sDefaults.putBoolean(KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL, true); + sDefaults.putBoolean(KEY_ALLOW_HOLD_VIDEO_CALL_BOOL, true); sDefaults.putBoolean(KEY_WIFI_CALLS_CAN_BE_HD_AUDIO, true); sDefaults.putBoolean(KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO, true); sDefaults.putBoolean(KEY_GSM_CDMA_CALLS_CAN_BE_HD_AUDIO, false);