summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2019-10-02 23:43:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-02 23:43:15 +0000
commitf99b67b657cbace200b59cb2f99d45307a0d106e (patch)
tree36d67221ef6923772e0dae44e6846a69181f5200
parent1f5ca753c426aaacb7ba11443558d7c856c437f4 (diff)
parent64a192b61f955f66ccb14bc2f05517b9ee2e07a6 (diff)
Merge "Add carrier config for allowing merge of RTT calls"
-rwxr-xr-xtelephony/java/android/telephony/CarrierConfigManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 4f6d2d4e2e26..3ef11f163290 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -481,6 +481,14 @@ public class CarrierConfigManager {
"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.
* <p>
@@ -3128,6 +3136,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, "");