commit 0617db0a21146d91760f978c97ed318d4b43f2dd
author Hall Liu <hallliu@google.com> Tue Jun 12 11:29:32 2018 -0700
committer Hall Liu <hallliu@google.com> Thu Jun 14 11:25:15 2018 -0700
tree 9442e3f8e527b3764cf65beeeea10436766ccfd5
parent 068670def068be918b64f6a6ea7df797c3959208

Mark RTT calls as non-conferenceable

In refreshConferenceSupported, check if the call is RTT and mark it
non-conferenceable if so. Also call refreshConferenceSupported when the
RTT status changes.

Bug: 109763648
Test: manual
Change-Id: I374b737d4f5dabec3091fb2da2eaf8355d54d221

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 d6fb3ad..2b0f49f 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -538,6 +538,7 @@
         @Override
         public void onRttModifyResponseReceived(int status) {
             updateConnectionProperties();
+            refreshConferenceSupported();
             if (status == RttModifyStatus.SESSION_MODIFY_REQUEST_SUCCESS) {
                 sendRttInitiationSuccess();
             } else {
@@ -554,7 +555,12 @@
 
         @Override
         public void onRttInitiated() {
-            updateConnectionProperties();
+            if (mOriginalConnection != null) {
+                // if mOriginalConnection is null, the properties will get set when
+                // mOriginalConnection gets set.
+                updateConnectionProperties();
+                refreshConferenceSupported();
+            }
             sendRttInitiationSuccess();
         }
 
@@ -2117,6 +2123,9 @@
         if (mTreatAsEmergencyCall) {
             isConferenceSupported = false;
             Log.d(this, "refreshConferenceSupported = false; emergency call");
+        } else if (isRtt()) {
+            isConferenceSupported = false;
+            Log.d(this, "refreshConferenceSupported = false; rtt call");
         } else if (!isConferencingSupported || isIms && !isImsConferencingSupported) {
             isConferenceSupported = false;
             Log.d(this, "refreshConferenceSupported = false; carrier doesn't support conf.");