diff options
| author | 2021-01-06 04:10:15 +0000 | |
|---|---|---|
| committer | 2021-01-06 04:10:15 +0000 | |
| commit | 53c3ecf4813bc7371db75201aed2905d53841182 (patch) | |
| tree | c3108baea78120d4802a92c4fa9ade030341cce3 | |
| parent | fcfa945fd417fe60870c39e2422f9b5afae4e0e5 (diff) | |
| parent | b31c9b4702bab5c82fbaf10f46cd02a336bc62d7 (diff) | |
Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535172
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8cbe93214aefa519d48e003d3b1cafdf65bf021b
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.java | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index d27b4aad8d00..e046c6fc6b24 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -38773,6 +38773,7 @@ package android.telecom { method public android.telecom.PhoneAccount.Builder toBuilder(); 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_CALL_COMPOSER = 32768; // 0x8000 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_CONNECTION_MANAGER = 1; // 0x1 diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index 5024ae27ee49..835ecaa8c90d 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -361,7 +361,13 @@ public final class PhoneAccount implements Parcelable { */ 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. @@ -1088,6 +1094,9 @@ public final class PhoneAccount implements Parcelable { if (hasCapabilities(CAPABILITY_ADHOC_CONFERENCE_CALLING)) { sb.append("AdhocConf"); } + if (hasCapabilities(CAPABILITY_CALL_COMPOSER)) { + sb.append("CallComposer "); + } return sb.toString(); } |