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

Merge "Expose MmTelCapabilities#isCapable() as Public API"

Browse Source
This commit is contained in:
Nathan Harold
2020-10-13 17:14:45 +00:00
committed by Gerrit Code Review
parent b9a205d2ac 1ebbc47c0e
commit 784c6a8db2
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -49108,6 +49108,7 @@ package android.telephony.ims.feature {
} }
public static class MmTelFeature.MmTelCapabilities { 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_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

1
api/system-current.txt
View File

@@ -12249,7 +12249,6 @@ package android.telephony.ims.feature {
ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities);
ctor public MmTelFeature.MmTelCapabilities(int); ctor public MmTelFeature.MmTelCapabilities(int);
method public final void addCapabilities(int); method public final void addCapabilities(int);
method public final boolean isCapable(int);
method public final void removeCapabilities(int); method public final void removeCapabilities(int);
} }

1
api/test-current.txt
View File

@@ -4707,7 +4707,6 @@ package android.telephony.ims.feature {
ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities);
ctor public MmTelFeature.MmTelCapabilities(int); ctor public MmTelFeature.MmTelCapabilities(int);
method public final void addCapabilities(int); method public final void addCapabilities(int);
method public final boolean isCapable(int);
method public final void removeCapabilities(int); method public final void removeCapabilities(int);
} }

1
non-updatable-api/current.txt
View File

@@ -47276,6 +47276,7 @@ package android.telephony.ims.feature {
} }
public static class MmTelFeature.MmTelCapabilities { 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_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

1
non-updatable-api/system-current.txt
View File

@@ -11131,7 +11131,6 @@ package android.telephony.ims.feature {
ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities);
ctor public MmTelFeature.MmTelCapabilities(int); ctor public MmTelFeature.MmTelCapabilities(int);
method public final void addCapabilities(int); method public final void addCapabilities(int);
method public final boolean isCapable(int);
method public final void removeCapabilities(int); method public final void removeCapabilities(int);
} }

1
telephony/api/system-current.txt
View File

@@ -1722,7 +1722,6 @@ package android.telephony.ims.feature {
ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities);
ctor public MmTelFeature.MmTelCapabilities(int); ctor public MmTelFeature.MmTelCapabilities(int);
method public final void addCapabilities(int); method public final void addCapabilities(int);
method public final boolean isCapable(int);
method public final void removeCapabilities(int); method public final void removeCapabilities(int);
} }

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

@@ -285,8 +285,8 @@ public class MmTelFeature extends ImsFeature {
public static final int CAPABILITY_TYPE_SMS = 1 << 3; public static final int CAPABILITY_TYPE_SMS = 1 << 3;
/** /**
* @hide * @hide
*/ */
@Override @Override
@SystemApi @TestApi @SystemApi @TestApi
public final void addCapabilities(@MmTelCapability int capabilities) { public final void addCapabilities(@MmTelCapability int capabilities) {
@@ -294,8 +294,8 @@ public class MmTelFeature extends ImsFeature {
} }
/** /**
* @hide * @hide
*/ */
@Override @Override
@SystemApi @TestApi @SystemApi @TestApi
public final void removeCapabilities(@MmTelCapability int capability) { 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 @Override
@SystemApi @TestApi
public final boolean isCapable(@MmTelCapability int capabilities) { public final boolean isCapable(@MmTelCapability int capabilities) {
return super.isCapable(capabilities); return super.isCapable(capabilities);
} }
/** /**
* @hide * @hide
*/ */
@NonNull @NonNull
@Override @Override
public String toString() { public String toString() {