commit ae7e88dfe716953f6ca0a222ecdb50f2fe58553e
author Hall Liu <hallliu@google.com> Fri Jun 01 00:34:52 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 01 00:34:52 2018 +0000
tree b1a3b8102ac823bff1d8069a282ed90f37a7b378
parent 2dca7412412347842d02ee9ed89d343b2b724270
parent 9afd2e7080f7d308d70d4ef5b51a19c26b6379ae

Merge "Don't send RTT upgrade request if already RTT" into pi-dev

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 e80a06e..d6fb3ad 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -838,7 +838,11 @@
     public void onStartRtt(RttTextStream textStream) {
         if (isImsConnection()) {
             ImsPhoneConnection originalConnection = (ImsPhoneConnection) mOriginalConnection;
-            originalConnection.sendRttModifyRequest(textStream);
+            if (originalConnection.isRttEnabledForCall()) {
+                originalConnection.setCurrentRttTextStream(textStream);
+            } else {
+                originalConnection.sendRttModifyRequest(textStream);
+            }
         } else {
             Log.w(this, "onStartRtt - not in IMS, so RTT cannot be enabled.");
         }