From 1ebbc47c0e02f92f8c711ac7ceb85bb373c42dba Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Tue, 19 May 2020 10:51:09 -0700 Subject: [PATCH] Expose MmTelCapabilities#isCapable() as Public API Expose the MmTelCapabilities#isCapable() API to complete a chain of APIs exposed for debuggability in Android RVC. Without this API, there is no (public) way for a caller that receives a capability callback to determine whether a particular MMTel feature is enabled for a particular IMS Connection. Bug: 156107100 Test: make update-api && make offline-sdk-docs && make Test: cts - ImsServiceTest#testCapabilityStatusCallback() Merged-In: I0a0d72897112460370e6981ae33cef4da6e3ce4b Change-Id: I0a0d72897112460370e6981ae33cef4da6e3ce4b (cherry picked from commit 21157d56a92672c4916a9d6877718b48f0e6ca0d) --- api/current.txt | 1 + api/system-current.txt | 1 - api/test-current.txt | 1 - non-updatable-api/current.txt | 1 + non-updatable-api/system-current.txt | 1 - telephony/api/system-current.txt | 1 - .../telephony/ims/feature/MmTelFeature.java | 19 ++++++++++--------- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/api/current.txt b/api/current.txt index 27a035e3474a5..d9239724210fe 100644 --- a/api/current.txt +++ b/api/current.txt @@ -49108,6 +49108,7 @@ package android.telephony.ims.feature { } public static class MmTelFeature.MmTelCapabilities { + method public final boolean isCapable(int); 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/api/system-current.txt b/api/system-current.txt index e163e7d792552..1d1a3cfd5f9d0 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -12249,7 +12249,6 @@ package android.telephony.ims.feature { ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor public MmTelFeature.MmTelCapabilities(int); method public final void addCapabilities(int); - method public final boolean isCapable(int); method public final void removeCapabilities(int); } diff --git a/api/test-current.txt b/api/test-current.txt index 415ed034f1763..2cb106e7fd514 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -4706,7 +4706,6 @@ package android.telephony.ims.feature { ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor public MmTelFeature.MmTelCapabilities(int); method public final void addCapabilities(int); - method public final boolean isCapable(int); method public final void removeCapabilities(int); } diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index 1aa5a5dd2ad7c..bbd5b23471d70 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -47276,6 +47276,7 @@ package android.telephony.ims.feature { } public static class MmTelFeature.MmTelCapabilities { + method public final boolean isCapable(int); 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/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt index 2b3e7815d0609..d1380bd9161ec 100644 --- a/non-updatable-api/system-current.txt +++ b/non-updatable-api/system-current.txt @@ -11131,7 +11131,6 @@ package android.telephony.ims.feature { ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor public MmTelFeature.MmTelCapabilities(int); method public final void addCapabilities(int); - method public final boolean isCapable(int); method public final void removeCapabilities(int); } diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index ddc608413db89..85d5985436769 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -1722,7 +1722,6 @@ package android.telephony.ims.feature { ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor public MmTelFeature.MmTelCapabilities(int); method public final void addCapabilities(int); - method public final boolean isCapable(int); method public final void removeCapabilities(int); } diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java index 01d468cb53f6e..de0fb86029dd9 100644 --- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java +++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java @@ -285,8 +285,8 @@ public class MmTelFeature extends ImsFeature { public static final int CAPABILITY_TYPE_SMS = 1 << 3; /** - * @hide - */ + * @hide + */ @Override @SystemApi @TestApi public final void addCapabilities(@MmTelCapability int capabilities) { @@ -294,8 +294,8 @@ public class MmTelFeature extends ImsFeature { } /** - * @hide - */ + * @hide + */ @Override @SystemApi @TestApi public final void removeCapabilities(@MmTelCapability int capability) { @@ -303,17 +303,18 @@ public class MmTelFeature extends ImsFeature { } /** - * @hide - */ + * @param capabilities a bitmask of one or more {@link MmTelCapability}. + * + * @return true if all queried capabilities are true, otherwise false. + */ @Override - @SystemApi @TestApi public final boolean isCapable(@MmTelCapability int capabilities) { return super.isCapable(capabilities); } /** - * @hide - */ + * @hide + */ @NonNull @Override public String toString() {