summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-06-06 22:49:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-06-06 22:49:06 +0000
commit0ce17247131a93be8e779477ac29b98d0e7fbcbe (patch)
treef2d1ca79abd90b873bfae6968d15bab66329ca7d
parent1004ab9533d3b4c8bf7d25c64be7114912e84286 (diff)
parent91958f831339583e631c2bf946e96808dec462cb (diff)
Merge "Supported two RTT calls at same time."
-rw-r--r--java/com/android/incallui/InCallActivity.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 7e1519724..a550ddeae 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -1555,11 +1555,11 @@ public class InCallActivity extends TransactionSafeFragmentActivity
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);