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

Commit 81304407 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

Change-Id: Ieafcc2c15eb0b7a2968faf979fe93e31088e86b5
parents 296e2145 1cb491e4

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7439,8 +7439,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 {