Merge "Deprecate SystemApi that was accidently made public in P"

This commit is contained in:
Treehugger Robot
2019-03-21 21:46:25 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 2 deletions

View File

@@ -7439,8 +7439,8 @@ package android.telephony.ims.feature {
field public static final int STATE_UNAVAILABLE = 0; // 0x0 field public static final int STATE_UNAVAILABLE = 0; // 0x0
} }
public static class ImsFeature.Capabilities { @Deprecated public static class ImsFeature.Capabilities {
field protected int mCapabilities; field @Deprecated protected int mCapabilities;
} }
protected static class ImsFeature.CapabilityCallbackProxy { protected static class ImsFeature.CapabilityCallbackProxy {

View File

@@ -210,6 +210,7 @@ public abstract class ImsFeature {
/** /**
* Contains the capabilities defined and supported by an ImsFeature in the form of a bit mask. * Contains the capabilities defined and supported by an ImsFeature in the form of a bit mask.
* @hide * @hide
* @deprecated
*/ */
@SystemApi // SystemApi only because it was leaked through type usage in a previous release. @SystemApi // SystemApi only because it was leaked through type usage in a previous release.
public static class Capabilities { public static class Capabilities {