Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "IMS: Propagate RTT capability of the called party to UI" am: 57704bd7a3 am: 86da26a494

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/696027

Change-Id: I389a90e671bea7920f20e97ca4335cfc6e938fea
This commit is contained in:
Tyler Gunn
2021-10-07 16:05:50 +00:00
committed by Automerger Merge Worker
parent ab6e8374b5 86da26a494
commit bbdfc69dee
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -39607,6 +39607,7 @@ package android.telecom {
field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80 field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4 field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
field public static final int CAPABILITY_MUTE = 64; // 0x40 field public static final int CAPABILITY_MUTE = 64; // 0x40
field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 268435456; // 0x10000000
field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20 field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000 field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300 field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
@@ -39893,6 +39894,7 @@ package android.telecom {
field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80 field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4 field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
field public static final int CAPABILITY_MUTE = 64; // 0x40 field public static final int CAPABILITY_MUTE = 64; // 0x40
field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 536870912; // 0x20000000
field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20 field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000 field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300 field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300

11
telecomm/java/android/telecom/Call.java Executable file → Normal file
View File

@@ -564,8 +564,14 @@ public final class Call {
*/ */
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x08000000; 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)) { if (can(capabilities, CAPABILITY_TRANSFER_CONSULTATIVE)) {
builder.append(" 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("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }

12
telecomm/java/android/telecom/Connection.java
View File

@@ -422,8 +422,14 @@ public abstract class Connection extends Conferenceable {
*/ */
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x10000000; 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) { == CAPABILITY_TRANSFER_CONSULTATIVE) {
builder.append(isLong ? " CAPABILITY_TRANSFER_CONSULTATIVE" : " sup_cTrans"); 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("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }