From d8e09b97444234d535e32ba18997f794265b6f5a Mon Sep 17 00:00:00 2001
From: Shuo Qian <shuoq@google.com>
Date: Tue, 1 Dec 2020 21:49:55 -0800
Subject: [PATCH] Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature

Test: cts
Bug: 173437870
Change-Id: Ife05ba75a3f23d0c18b3aa068881b6646dee6db5
Merged-In: Ife05ba75a3f23d0c18b3aa068881b6646dee6db5
(cherry picked from commit 89667c6bb208c58363ecf63af73aa68de2290f33)
---
 core/api/current.txt                              |  1 +
 .../telephony/ims/feature/MmTelFeature.java       | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 74d313c636b75..9d154258545d0 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -42573,6 +42573,7 @@ package android.telephony.ims.feature {
 
   public static class MmTelFeature.MmTelCapabilities {
     method public final boolean isCapable(int);
+    field public static final int CAPABILITY_TYPE_CALL_COMPOSER = 16; // 0x10
     field public static final int CAPABILITY_TYPE_SMS = 8; // 0x8
     field public static final int CAPABILITY_TYPE_UT = 4; // 0x4
     field public static final int CAPABILITY_TYPE_VIDEO = 2; // 0x2
diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java
index e570fb6f5612a..0b2c6d974980d 100644
--- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java
+++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java
@@ -231,8 +231,9 @@ public class MmTelFeature extends ImsFeature {
      * The capabilities that are used in MmTelFeature are defined as
      * {@link MmTelCapabilities#CAPABILITY_TYPE_VOICE},
      * {@link MmTelCapabilities#CAPABILITY_TYPE_VIDEO},
-     * {@link MmTelCapabilities#CAPABILITY_TYPE_UT}, and
-     * {@link MmTelCapabilities#CAPABILITY_TYPE_SMS}.
+     * {@link MmTelCapabilities#CAPABILITY_TYPE_UT},
+     * {@link MmTelCapabilities#CAPABILITY_TYPE_SMS}, and
+     * {@link MmTelCapabilities#CAPABILITY_TYPE_CALL_COMPOSER}.
      *
      * The capabilities of this MmTelFeature will be set by the framework.
      */
@@ -275,7 +276,8 @@ public class MmTelFeature extends ImsFeature {
                         CAPABILITY_TYPE_VOICE,
                         CAPABILITY_TYPE_VIDEO,
                         CAPABILITY_TYPE_UT,
-                        CAPABILITY_TYPE_SMS
+                        CAPABILITY_TYPE_SMS,
+                        CAPABILITY_TYPE_CALL_COMPOSER
                 })
         @Retention(RetentionPolicy.SOURCE)
         public @interface MmTelCapability {}
@@ -300,6 +302,11 @@ public class MmTelFeature extends ImsFeature {
          */
         public static final int CAPABILITY_TYPE_SMS = 1 << 3;
 
+        /**
+         * This MmTelFeature supports Call Composer (section 2.4 of RC.20)
+         */
+        public static final int CAPABILITY_TYPE_CALL_COMPOSER = 1 << 4;
+
         /**
          * @hide
          */
@@ -343,6 +350,8 @@ public class MmTelFeature extends ImsFeature {
             builder.append(isCapable(CAPABILITY_TYPE_UT));
             builder.append(" SMS: ");
             builder.append(isCapable(CAPABILITY_TYPE_SMS));
+            builder.append(" CALL_COMPOSER: ");
+            builder.append(isCapable(CAPABILITY_TYPE_CALL_COMPOSER));
             builder.append("]");
             return builder.toString();
         }