Merge "Deprecate SystemApi that was accidently made public in P"
diff --git a/api/system-current.txt b/api/system-current.txt
index 97b210f..193ead6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7439,8 +7439,8 @@
field public static final int STATE_UNAVAILABLE = 0; // 0x0
}
- public static class ImsFeature.Capabilities {
- field protected int mCapabilities;
+ @Deprecated public static class ImsFeature.Capabilities {
+ field @Deprecated protected int mCapabilities;
}
protected static class ImsFeature.CapabilityCallbackProxy {
diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java
index b55866b..d2b4133 100644
--- a/telephony/java/android/telephony/ims/feature/ImsFeature.java
+++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java
@@ -210,6 +210,7 @@
/**
* Contains the capabilities defined and supported by an ImsFeature in the form of a bit mask.
* @hide
+ * @deprecated
*/
@SystemApi // SystemApi only because it was leaked through type usage in a previous release.
public static class Capabilities {