Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature"

Browse Source
This commit is contained in:
Shuo Qian
2021-01-06 00:48:00 +00:00
committed by Gerrit Code Review
parent 4260bc4f95 d8e09b9744
commit bfd05221a3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -41890,6 +41890,7 @@ package android.telephony.ims.feature {
public static class MmTelFeature.MmTelCapabilities { public static class MmTelFeature.MmTelCapabilities {
method public final boolean isCapable(int); 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_SMS = 8; // 0x8
field public static final int CAPABILITY_TYPE_UT = 4; // 0x4 field public static final int CAPABILITY_TYPE_UT = 4; // 0x4
field public static final int CAPABILITY_TYPE_VIDEO = 2; // 0x2 field public static final int CAPABILITY_TYPE_VIDEO = 2; // 0x2

15
telephony/java/android/telephony/ims/feature/MmTelFeature.java
View File

@@ -231,8 +231,9 @@ public class MmTelFeature extends ImsFeature {
* The capabilities that are used in MmTelFeature are defined as * The capabilities that are used in MmTelFeature are defined as
* {@link MmTelCapabilities#CAPABILITY_TYPE_VOICE}, * {@link MmTelCapabilities#CAPABILITY_TYPE_VOICE},
* {@link MmTelCapabilities#CAPABILITY_TYPE_VIDEO}, * {@link MmTelCapabilities#CAPABILITY_TYPE_VIDEO},
* {@link MmTelCapabilities#CAPABILITY_TYPE_UT}, and * {@link MmTelCapabilities#CAPABILITY_TYPE_UT},
* {@link MmTelCapabilities#CAPABILITY_TYPE_SMS}. * {@link MmTelCapabilities#CAPABILITY_TYPE_SMS}, and
* {@link MmTelCapabilities#CAPABILITY_TYPE_CALL_COMPOSER}.
* *
* The capabilities of this MmTelFeature will be set by the framework. * 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_VOICE,
CAPABILITY_TYPE_VIDEO, CAPABILITY_TYPE_VIDEO,
CAPABILITY_TYPE_UT, CAPABILITY_TYPE_UT,
CAPABILITY_TYPE_SMS CAPABILITY_TYPE_SMS,
CAPABILITY_TYPE_CALL_COMPOSER
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface MmTelCapability {} public @interface MmTelCapability {}
@@ -300,6 +302,11 @@ public class MmTelFeature extends ImsFeature {
*/ */
public static final int CAPABILITY_TYPE_SMS = 1 << 3; 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 * @hide
*/ */
@@ -343,6 +350,8 @@ public class MmTelFeature extends ImsFeature {
builder.append(isCapable(CAPABILITY_TYPE_UT)); builder.append(isCapable(CAPABILITY_TYPE_UT));
builder.append(" SMS: "); builder.append(" SMS: ");
builder.append(isCapable(CAPABILITY_TYPE_SMS)); builder.append(isCapable(CAPABILITY_TYPE_SMS));
builder.append(" CALL_COMPOSER: ");
builder.append(isCapable(CAPABILITY_TYPE_CALL_COMPOSER));
builder.append("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }