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

Commit f4cd3de7 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Re-deprecating Capabilities in ImsFeature"

parents 156f347d 98c0e000

api/system-current.txt

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















  }
























@@ -9272,7 +9272,7 @@ package android.telephony.ims.feature {













  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);

























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



+9
−4




























Original line number
Diff line number
Diff line








@@ -201,15 +201,20 @@ public abstract class ImsFeature {













    }































    /**













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































        /**

































telephony/java/android/telephony/ims/feature/MmTelFeature.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -242,8 +242,8 @@ public class MmTelFeature extends ImsFeature {













         * @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,