commit 91958f831339583e631c2bf946e96808dec462cb
author wangqi <wangqi@google.com> Wed Jun 06 14:01:47 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Jun 06 15:23:23 2018 -0700
tree f2d1ca79abd90b873bfae6968d15bab66329ca7d
parent 1004ab9533d3b4c8bf7d25c64be7114912e84286

Supported two RTT calls at same time.

Bug: 109738484
Test: manual
PiperOrigin-RevId: 199524711
Change-Id: Ia75c41004179da5eae17b6acbc952d652e8d7480

java/com/android/incallui/InCallActivity.java

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 7e15197..a550dde 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -1555,11 +1555,11 @@
 
   private boolean showRttCallScreenFragment(FragmentTransaction transaction, DialerCall call) {
     if (didShowRttCallScreen) {
-      // This shouldn't happen since only one RTT call is allow at same time.
-      if (!getRttCallScreen().getCallId().equals(call.getId())) {
-        LogUtil.e("InCallActivity.showRttCallScreenFragment", "RTT call id doesn't match");
+      if (getRttCallScreen().getCallId().equals(call.getId())) {
+        return false;
       }
-      return false;
+      LogUtil.i("InCallActivity.showRttCallScreenFragment", "RTT call id doesn't match");
+      hideRttCallScreenFragment(transaction);
     }
     RttCallScreen rttCallScreen = RttBindings.createRttCallScreen(call.getId());
     transaction.add(R.id.main, rttCallScreen.getRttCallScreenFragment(), Tags.RTT_CALL_SCREEN);