From ef8000800011ae4557b988dd3ce37d27c1ab17e0 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Mon, 29 Jul 2019 16:18:30 -0700 Subject: Add carrier config for allowing merge of RTT calls Add a carrier config key that specifies whether merging an RTT call is allowed. Bug: 136035168 Test: manual Change-Id: I8cfdf68c69b50abed88d7c835db0480a53755f5a --- telephony/java/android/telephony/CarrierConfigManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index cea4fafc7c18..56a6d61fc6bf 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -467,6 +467,14 @@ public class CarrierConfigManager { public static final String KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL = "notify_handover_video_from_wifi_to_lte_bool"; + /** + * Flag specifying whether the carrier supports merging a RTT call with a voice call, + * downgrading the call in the process. + * @hide + */ + public static final String KEY_ALLOW_MERGING_RTT_CALLS_BOOL = + "allow_merging_rtt_calls_bool"; + /** * Flag specifying whether the carrier wants to notify the user when a VT call has been handed * over from LTE to WIFI. @@ -3057,6 +3065,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false); + sDefaults.putBoolean(KEY_ALLOW_MERGING_RTT_CALLS_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_LTE_TO_WIFI_BOOL, false); sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true); sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, ""); -- cgit v1.2.3-59-g8ed1b