diff options
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/feature/ImsFeature.java | 13 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/feature/MmTelFeature.java | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index eb7ed6ecc769..09737e880ec4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9238,7 +9238,7 @@ package android.telephony.ims.feature { field public static final int STATE_UNAVAILABLE = 0; // 0x0 } - public static class ImsFeature.Capabilities { + @Deprecated public static class ImsFeature.Capabilities { field @Deprecated protected int mCapabilities; } @@ -9272,7 +9272,7 @@ package android.telephony.ims.feature { public static class MmTelFeature.MmTelCapabilities extends android.telephony.ims.feature.ImsFeature.Capabilities { ctor public MmTelFeature.MmTelCapabilities(); ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); - ctor public MmTelFeature.MmTelCapabilities(int); + ctor public MmTelFeature.MmTelCapabilities(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int); method public final void addCapabilities(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int); method public final boolean isCapable(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int); method public final void removeCapabilities(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int); diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java index 3a9979d78a55..356288047e15 100644 --- a/telephony/java/android/telephony/ims/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java @@ -201,15 +201,20 @@ public abstract class ImsFeature { } /** - * Contains the capabilities defined and supported by an ImsFeature in the form of a bit mask. - * <p> - * Typically this class is not used directly, but rather extended in subclasses of + * Contains the IMS capabilities defined and supported by an ImsFeature in the form of a + * bit-mask. + * + * @deprecated This class is not used directly, but rather extended in subclasses of * {@link ImsFeature} to provide service specific capabilities. + * @see MmTelFeature.MmTelCapabilities * @hide */ - @SystemApi + // Not Actually deprecated, but we need to remove it from the @SystemApi surface. + @Deprecated + @SystemApi // SystemApi only because it was leaked through type usage in a previous release. public static class Capabilities { /** @deprecated Use getters and accessors instead. */ + // Not actually deprecated, but we need to remove it from the @SystemApi surface eventually. protected int mCapabilities = 0; /** diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java index 20c191da0550..ceb470491dc5 100644 --- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java +++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java @@ -242,8 +242,8 @@ public class MmTelFeature extends ImsFeature { * @param capabilities The capabilities that are supported for MmTel in the form of a * bitfield. */ - public MmTelCapabilities(int capabilities) { - mCapabilities = capabilities; + public MmTelCapabilities(@MmTelCapability int capabilities) { + super(capabilities); } @IntDef(flag = true, |