commit 46858aa544fab6590cf2bf801dc48a4c8d64f7bc
author Hall Liu <hallliu@google.com> Fri Oct 05 18:20:40 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 05 18:20:40 2018 -0700
tree bc9a19707b35c018d374a71e9a9ee747ca7e914b
parent 185ebf4ade2ea12015acf640ed8308f05628444d
parent c0c4a2f12bf45f86a60f37afdee4fb2fabfa382e

Merge "Wire up the stopRtt API" am: 9358dee245
am: c0c4a2f12b

Change-Id: I2a71a46d2e70d434281034ecbee2304d5091d586

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 3192c75..8f46ecf 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -892,7 +892,7 @@
             if (originalConnection.isRttEnabledForCall()) {
                 originalConnection.setCurrentRttTextStream(textStream);
             } else {
-                originalConnection.sendRttModifyRequest(textStream);
+                originalConnection.startRtt(textStream);
             }
         } else {
             Log.w(this, "onStartRtt - not in IMS, so RTT cannot be enabled.");
@@ -901,7 +901,16 @@
 
     @Override
     public void onStopRtt() {
-        Log.i(this, "Stopping RTT currently not supported. Doing nothing.");
+        if (isImsConnection()) {
+            ImsPhoneConnection originalConnection = (ImsPhoneConnection) mOriginalConnection;
+            if (originalConnection.isRttEnabledForCall()) {
+                originalConnection.stopRtt();
+            } else {
+                Log.w(this, "onStopRtt - not in RTT call, ignoring");
+            }
+        } else {
+            Log.w(this, "onStopRtt - not in IMS, ignoring");
+        }
     }
 
     @Override