Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c65941 authored by wangqi's avatar wangqi Committed by android-build-merger
Browse files

Merge "Supported two RTT calls at same time." am: 0ce17247 am: 832cc822 

am: 9f1f7da2

Change-Id: I4169026a7bdaf4ff355e8881bb252cb9432dba61
parents 5474ec88 9f1f7da2

java/com/android/incallui/InCallActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -1555,12 +1555,12 @@ 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;

      }

      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);

    Logger.get(this).logScreenView(ScreenEvent.Type.INCALL, this);