diff options
| author | 2020-02-19 19:51:44 +0000 | |
|---|---|---|
| committer | 2020-02-19 19:51:44 +0000 | |
| commit | 32cdb7dcbb33391381c67a25339deedbe02d0d0e (patch) | |
| tree | 23e996c253659b4efbd1d49d8f74850c14126784 | |
| parent | 0624828d4116f9b7d50be338c8ba9425b70591b5 (diff) | |
| parent | 10f01e3c4ce825f8e20e1c6c608eb81119028988 (diff) | |
Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." am: 10f01e3c4c
Change-Id: I5d69ec2f11680ef25b06cd1e1b6460dd4b1e8523
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 7fe5617161da..8943b9a486a6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44703,8 +44703,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 717d85422dd4..d1f7b88f8b9e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1966,10 +1966,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. + * <p> + * 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 @@ -3714,7 +3719,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); |