commit f6be61727fba9b0fdac3b9d69588e4467f861552
author wangqi <wangqi@google.com> Fri Mar 30 15:57:56 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Mar 30 17:13:38 2018 -0700
tree 59cc77a5e0567cb67089697d6c274a0d2052726f
parent f5f774df4b487d702b5509ce6caaac69bd2f726f

Add upgrade to RTT call button.

This button has higher priority over add call button if RTT is enabled.

Bug: 67596257
Test: ButtonChooserIntegrationTest
PiperOrigin-RevId: 191129313
Change-Id: I5a3302a0970e77a933439749e0e559a691235523

java/com/android/incallui/InCallActivity.java

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 9d08dc4..1ba3683 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -1468,7 +1468,7 @@
       return new ShouldShowUiResult(false, null);
     }
 
-    if (call.isRttCall()) {
+    if (call.isActiveRttCall()) {
       LogUtil.i("InCallActivity.getShouldShowRttUi", "found rtt call");
       return new ShouldShowUiResult(true, call);
     }
@@ -1520,7 +1520,7 @@
     AnswerScreen answerScreen =
         AnswerBindings.createAnswerScreen(
             call.getId(),
-            call.isRttCall(),
+            call.isActiveRttCall(),
             call.isVideoCall(),
             isVideoUpgradeRequest,
             call.getVideoTech().isSelfManagedCamera(),