Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a39d8e9e authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Deprecate SystemApi that was accidently made public in P" am: 18870b2e am: 1cb491e4 

am: 81304407

Change-Id: I4b8d90f70f2daae91186d2434b97166fc8b7ae8f
parents 55ee914a 81304407

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9127,8 +9127,8 @@ package android.telephony.ims.feature { 
    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 {

























telephony/java/android/telephony/ims/feature/ImsFeature.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -210,6 +210,7 @@ public abstract class ImsFeature {













    /**















     * 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 {