Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a am: 36d3aa0e02 am: 86d97445cf
am: 384b50304f
Change-Id: Ib8d2e1d1184a168dee79ac3e31b6a46f4c0b3ac5
diff --git a/api/system-current.txt b/api/system-current.txt
index 8ee6e63..2843916 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9309,7 +9309,7 @@
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;
}
@@ -9343,7 +9343,7 @@
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 3a9979d..3562880 100644
--- a/telephony/java/android/telephony/ims/feature/ImsFeature.java
+++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java
@@ -201,15 +201,20 @@
}
/**
- * 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 20c191d..ceb4704 100644
--- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java
+++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java
@@ -242,8 +242,8 @@
* @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,