Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83a86a18 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60ffda5fb86b760369e200e8edcc1da5b615821f
parents a1106b08 bfd05221
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -41890,6 +41890,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
+12 −3
Original line number Diff line number Diff line
@@ -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();
        }