diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | non-updatable-api/current.txt | 1 | ||||
| -rw-r--r-- | non-updatable-api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/feature/MmTelFeature.java | 19 |
7 files changed, 12 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index 27a035e3474a..d9239724210f 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 e163e7d79255..1d1a3cfd5f9d 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 415ed034f176..2cb106e7fd51 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 1aa5a5dd2ad7..bbd5b23471d7 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 2b3e7815d060..d1380bd9161e 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 ddc608413db8..85d598543676 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 01d468cb53f6..de0fb86029dd 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() { |