commit d24aea31483c70fa684f8b54965dc045b263f34b
author Shuo Qian <shuoq@google.com> Tue Nov 24 15:08:49 2020 -0800
committer Shuo Qian <shuoq@google.com> Wed Nov 25 17:58:26 2020 +0000
tree 500eb6b9b2161b08a524837729d8391c253afd7c
parent ed7b77e88da2fd7faf85bc92379cac3cd011c446

Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling.

Test: cts
Bug: 173437870
Change-Id: Ibd1b0f0bc66487cfdb05d3de46c7e8df74eeb8cc

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 9f7f391..23382be 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -44553,6 +44553,7 @@
     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

telecomm/java/android/telecom/PhoneAccount.java

diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index 5024ae2..835ecaa 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -361,7 +361,13 @@
      */
     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 @@
         if (hasCapabilities(CAPABILITY_ADHOC_CONFERENCE_CALLING)) {
             sb.append("AdhocConf");
         }
+        if (hasCapabilities(CAPABILITY_CALL_COMPOSER)) {
+            sb.append("CallComposer ");
+        }
         return sb.toString();
     }