commit faa3989f377516b908cf84f990d1c194aaa386c3
author Grace Jia <xiaotonj@google.com> Thu Oct 03 21:06:13 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 03 21:06:13 2019 +0000
tree 1091ee87717f78276b12d74e950a6227997de135
parent 42f3e123cfc4aa64d160089a07d163dce27d3e95
parent 7694b7be9713a3c950296fa60727b6e1472dd54c

Merge "Fixed incall UI to emulate single party call correctly when one participant dropped during conference creation."

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 7e29e85..414e4d2 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -2219,6 +2219,8 @@
         if (isIms) {
             isVoWifiEnabled = ImsUtil.isWfcEnabled(phone.getContext(), phone.getPhoneId());
         }
+        boolean isRttMergeSupported = getCarrierConfig()
+                .getBoolean(CarrierConfigManager.KEY_ALLOW_MERGING_RTT_CALLS_BOOL);
         PhoneAccountHandle phoneAccountHandle = isIms ? PhoneUtils
                 .makePstnPhoneAccountHandle(phone.getDefaultPhone())
                 : PhoneUtils.makePstnPhoneAccountHandle(phone);
@@ -2243,7 +2245,7 @@
         if (mTreatAsEmergencyCall) {
             isConferenceSupported = false;
             Log.d(this, "refreshConferenceSupported = false; emergency call");
-        } else if (isRtt()) {
+        } else if (isRtt() && !isRttMergeSupported) {
             isConferenceSupported = false;
             Log.d(this, "refreshConferenceSupported = false; rtt call");
         } else if (!isConferencingSupported || isIms && !isImsConferencingSupported) {