summaryrefslogtreecommitdiff
path: root/telecomm/java/android
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2021-10-07 16:18:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-07 16:18:49 +0000
commitc799bb6a82d60842e681e45b8ba5d6b7bb1d752f (patch)
tree9e4552253395b37f32c88fd0d873e6f85c6ec6ce /telecomm/java/android
parent0fda0ff863f72e502ba615fe70560c75e55464f2 (diff)
parentbbdfc69dee9c26c1a333afa7c431fd8cda4e9592 (diff)
Merge "IMS: Propagate RTT capability of the called party to UI" am: 57704bd7a3 am: 86da26a494 am: bbdfc69dee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/696027 Change-Id: I667b0a37e343a9ba0b37982d36fa0b0d0382e2b6
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--[-rwxr-xr-x]telecomm/java/android/telecom/Call.java11
-rw-r--r--telecomm/java/android/telecom/Connection.java12
2 files changed, 21 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index f0d43faed5ed..d94fafc6a5bf 100755..100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -564,8 +564,14 @@ public final class Call {
*/
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x08000000;
+ /**
+ * Indicates whether the remote party supports RTT or not to the UI.
+ */
+
+ public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 0x10000000;
+
//******************************************************************************************
- // Next CAPABILITY value: 0x10000000
+ // Next CAPABILITY value: 0x20000000
//******************************************************************************************
/**
@@ -817,6 +823,9 @@ public final class Call {
if (can(capabilities, CAPABILITY_TRANSFER_CONSULTATIVE)) {
builder.append(" CAPABILITY_TRANSFER_CONSULTATIVE");
}
+ if (can(capabilities, CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT)) {
+ builder.append(" CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT");
+ }
builder.append("]");
return builder.toString();
}
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 30fd52814685..9fec96b7f549 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -422,8 +422,14 @@ public abstract class Connection extends Conferenceable {
*/
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x10000000;
+ /**
+ * Indicates whether the remote party supports RTT or not to the UI.
+ */
+
+ public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 0x20000000;
+
//**********************************************************************************************
- // Next CAPABILITY value: 0x20000000
+ // Next CAPABILITY value: 0x40000000
//**********************************************************************************************
/**
@@ -1138,6 +1144,10 @@ public abstract class Connection extends Conferenceable {
== CAPABILITY_TRANSFER_CONSULTATIVE) {
builder.append(isLong ? " CAPABILITY_TRANSFER_CONSULTATIVE" : " sup_cTrans");
}
+ if ((capabilities & CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT)
+ == CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT) {
+ builder.append(isLong ? " CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT" : " sup_rtt");
+ }
builder.append("]");
return builder.toString();
}