commit 2610794c2a4e3db59c6de1f052bc65b79a2e6b6c
author Hall Liu <hallliu@google.com> Fri Mar 16 11:45:59 2018 -0700
committer Hall Liu <hallliu@google.com> Fri Mar 16 18:49:35 2018 +0000
tree 7e4c1542bdd561b12415bc81e92fb2963f53e027
parent b85c381ffb8fbb0a22e374657fdc4108258a9e73

Pass RTT streams down regardless of incoming call request

When an incoming call doesn't request RTT but the UI RTT setting is on,
pass the RTT pipes down anyway in case the modem is doing something
weird with turning RTT on later in the call.

Bug: 74451081
Test: manual
Change-Id: I00e413eff0e979a8da2d41f0d8231b45e85633cb

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

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 9813ad4..f9aeb7a 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -740,6 +740,9 @@
             return;
         }
 
+        Log.i(this, "Setting RTT stream on ImsPhoneConnection in case we need it later");
+        imsOriginalConnection.setCurrentRttTextStream(request.getRttTextStream());
+
         if (!imsOriginalConnection.isRttEnabledForCall()) {
             if (request.isRequestingRtt()) {
                 Log.w(this, "Incoming call processed as RTT but did not come in as one. Ignoring");
@@ -747,8 +750,7 @@
             return;
         }
 
-        Log.i(this, "Setting RTT stream on ImsPhoneConnection");
-        imsOriginalConnection.setCurrentRttTextStream(request.getRttTextStream());
+        Log.i(this, "Setting the call to be answered with RTT on.");
         imsOriginalConnection.getImsCall().setAnswerWithRtt();
     }