summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuo Qian <shuoq@google.com>2020-11-24 15:08:49 -0800
committersqian <shuoq@google.com>2020-12-23 00:00:44 +0000
commitabee612ab0bdbd3fb8fef3bf4607a2dc305d2dcf (patch)
treee2a6fac2777dcbb74b38647ab9b59fb47b97c1ca
parentea8ca4b88a4bd3503168f041751f1d7a270e8a68 (diff)
Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling.
Test: cts Bug: 173437870 Change-Id: Ibd1b0f0bc66487cfdb05d3de46c7e8df74eeb8cc Merged-In: Ibd1b0f0bc66487cfdb05d3de46c7e8df74eeb8cc (cherry picked from commit d24aea31483c70fa684f8b54965dc045b263f34b)
-rw-r--r--core/api/current.txt1
-rw-r--r--telecomm/java/android/telecom/PhoneAccount.java11
2 files changed, 11 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 74d313c636b7..9b5694160c70 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -39466,6 +39466,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();
}