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

Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5998c11bd5f7b8d2168dc353c563790ef9478e2d
This commit is contained in:
Shuo Qian
2021-01-06 03:49:09 +00:00
committed by Automerger Merge Worker
parent 9a1365f43d b31c9b4702
commit ce4f99fd74
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -38773,6 +38773,7 @@ package android.telecom {
method public android.telecom.PhoneAccount.Builder toBuilder(); method public android.telecom.PhoneAccount.Builder toBuilder();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final int CAPABILITY_ADHOC_CONFERENCE_CALLING = 16384; // 0x4000 field public static final int CAPABILITY_ADHOC_CONFERENCE_CALLING = 16384; // 0x4000
field public static final int CAPABILITY_CALL_COMPOSER = 32768; // 0x8000
field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2 field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2
field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40 field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40
field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1 field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1

11
telecomm/java/android/telecom/PhoneAccount.java
View File

@@ -361,7 +361,13 @@ public final class PhoneAccount implements Parcelable {
*/ */
public static final int CAPABILITY_ADHOC_CONFERENCE_CALLING = 0x4000; public static final int CAPABILITY_ADHOC_CONFERENCE_CALLING = 0x4000;
/* NEXT CAPABILITY: 0x8000 */ /**
* Flag indicating whether this {@link PhoneAccount} is capable of supporting the call composer
* functionality for enriched calls.
*/
public static final int CAPABILITY_CALL_COMPOSER = 0x8000;
/* NEXT CAPABILITY: 0x10000 */
/** /**
* URI scheme for telephone number URIs. * URI scheme for telephone number URIs.
@@ -1088,6 +1094,9 @@ public final class PhoneAccount implements Parcelable {
if (hasCapabilities(CAPABILITY_ADHOC_CONFERENCE_CALLING)) { if (hasCapabilities(CAPABILITY_ADHOC_CONFERENCE_CALLING)) {
sb.append("AdhocConf"); sb.append("AdhocConf");
} }
if (hasCapabilities(CAPABILITY_CALL_COMPOSER)) {
sb.append("CallComposer ");
}
return sb.toString(); return sb.toString();
} }