Merge "Mark RTT calls as non-conferenceable" am: 83f171da21 am: 7f99ca0a46
am: 83feefcf86
Change-Id: I6392862052ca0043957ea086a32b6d875f469b53
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index c06fd27..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 {
@@ -558,6 +559,7 @@
// if mOriginalConnection is null, the properties will get set when
// mOriginalConnection gets set.
updateConnectionProperties();
+ refreshConferenceSupported();
}
sendRttInitiationSuccess();
}
@@ -2121,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.");