diff options
| author | 2019-12-17 13:20:46 -0800 | |
|---|---|---|
| committer | 2019-12-17 13:20:46 -0800 | |
| commit | 0336989eb8b43e4cf328bd5f3a620b6fc92a52df (patch) | |
| tree | a17dd3a86723c8edeab20ddf6be724126633ff7a | |
| parent | 86df43feba396e2284b4e6f4f6a90332739a36b4 (diff) | |
| parent | fc72e79558f5f095902d4f27a52f23743fcc9dd6 (diff) | |
Merge "IMS-VT: Add config to control holding a video call"
am: fc72e79558
Change-Id: I49062ce6d0c0934f337d79ee2857c9526d22a980
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 6715d2120084..b33ab56d2691 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44141,6 +44141,7 @@ 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_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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 1c7b9d2f7353..ef2ccf121cd1 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1956,6 +1956,12 @@ public class CarrierConfigManager { "allow_add_call_during_video_call"; /** + * When false, indicates that holding a video call is disabled + */ + public static final String KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL = + "allow_holding_video_call"; + + /** * When true, indicates that the HD audio icon in the in-call screen should not be shown for * VoWifi calls. * @hide @@ -3640,6 +3646,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_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); |