Merge "Add carrier config for allowing merge of RTT calls" into qt-r1-dev am: f84ff34a31

am: bbb0db164d

Change-Id: I31d305880421befa704bbdd43d799c6d9881b7d9
This commit is contained in:
Hall Liu
2019-08-08 17:31:35 -07:00
committed by android-build-merger

View File

@@ -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.
@@ -3122,6 +3130,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, "");