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

Commit a571f1c9 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove inconsistent @Deprecated behavior in *removed.txt files 

Previously, `@Deprecated` was handled differently in `*removed.txt`
files compared to `*current.txt`. In the former `@Deprecated` on a
class was not propagated to its class members or nested classes but in
the latter it was. This change removes that inconsistency by making it
behave the same way in the `*removed.txt` files as it already does in
the `*current.txt` files.

Bug: 373584764
Test: m checkapi
Change-Id: I828c94e7c7094bae2a619c9a4367688fce1b8c61
parent 12eee8d5

core/api/removed.txt

+30 −30
Original line number Diff line number Diff line
@@ -82,12 +82,12 @@ package android.database { 
package android.graphics {



  @Deprecated public class AvoidXfermode extends android.graphics.Xfermode {

    ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);

    ctor @Deprecated public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);

  }



  public enum AvoidXfermode.Mode {

    enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;

    enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;

  @Deprecated public enum AvoidXfermode.Mode {

    enum_constant @Deprecated public static final android.graphics.AvoidXfermode.Mode AVOID;

    enum_constant @Deprecated public static final android.graphics.AvoidXfermode.Mode TARGET;

  }



  public class Canvas {
@@ -102,9 +102,9 @@ package android.graphics { 
  }



  @Deprecated public class LayerRasterizer extends android.graphics.Rasterizer {

    ctor public LayerRasterizer();

    method public void addLayer(android.graphics.Paint, float, float);

    method public void addLayer(android.graphics.Paint);

    ctor @Deprecated public LayerRasterizer();

    method @Deprecated public void addLayer(android.graphics.Paint, float, float);

    method @Deprecated public void addLayer(android.graphics.Paint);

  }



  public class Paint {
@@ -118,7 +118,7 @@ package android.graphics { 
  }



  @Deprecated public class PixelXorXfermode extends android.graphics.Xfermode {

    ctor public PixelXorXfermode(int);

    ctor @Deprecated public PixelXorXfermode(int);

  }



  public class Rasterizer {
@@ -170,14 +170,14 @@ package android.media.tv { 
package android.net {



  @Deprecated public class NetworkBadging {

    method @NonNull public static android.graphics.drawable.Drawable getWifiIcon(@IntRange(from=0, to=4) int, int, @Nullable android.content.res.Resources.Theme);

    field public static final int BADGING_4K = 30; // 0x1e

    field public static final int BADGING_HD = 20; // 0x14

    field public static final int BADGING_NONE = 0; // 0x0

    field public static final int BADGING_SD = 10; // 0xa

    method @Deprecated @NonNull public static android.graphics.drawable.Drawable getWifiIcon(@IntRange(from=0, to=4) int, int, @Nullable android.content.res.Resources.Theme);

    field @Deprecated public static final int BADGING_4K = 30; // 0x1e

    field @Deprecated public static final int BADGING_HD = 20; // 0x14

    field @Deprecated public static final int BADGING_NONE = 0; // 0x0

    field @Deprecated public static final int BADGING_SD = 10; // 0xa

  }



  @IntDef({0x0, 0xa, 0x14, 0x1e}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface NetworkBadging.Badging {

  @Deprecated @IntDef({0x0, 0xa, 0x14, 0x1e}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface NetworkBadging.Badging {

  }



  public final class Proxy {
@@ -304,14 +304,14 @@ package android.provider { 


  @Deprecated public static final class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {

    field @Deprecated public static final String CONTENT_DIRECTORY = "stream_items";

    field public static final String _COUNT = "_count";

    field public static final String _ID = "_id";

    field @Deprecated public static final String _COUNT = "_count";

    field @Deprecated public static final String _ID = "_id";

  }



  @Deprecated public static final class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {

    field @Deprecated public static final String PHOTO = "photo";

    field public static final String _COUNT = "_count";

    field public static final String _ID = "_id";

    field @Deprecated public static final String _COUNT = "_count";

    field @Deprecated public static final String _ID = "_id";

  }



  @Deprecated protected static interface ContactsContract.StreamItemPhotosColumns {
@@ -332,16 +332,16 @@ package android.provider { 
    field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item";

    field @Deprecated public static final android.net.Uri CONTENT_URI;

    field @Deprecated public static final String MAX_ITEMS = "max_items";

    field public static final String _COUNT = "_count";

    field public static final String _ID = "_id";

    field @Deprecated public static final String _COUNT = "_count";

    field @Deprecated public static final String _ID = "_id";

  }



  @Deprecated public static final class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {

    field @Deprecated public static final String CONTENT_DIRECTORY = "photo";

    field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo";

    field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo";

    field public static final String _COUNT = "_count";

    field public static final String _ID = "_id";

    field @Deprecated public static final String _COUNT = "_count";

    field @Deprecated public static final String _ID = "_id";

  }



  @Deprecated protected static interface ContactsContract.StreamItemsColumns {
@@ -447,14 +447,14 @@ package android.text.style { 
package android.util {



  @Deprecated public class FloatMath {

    method public static float ceil(float);

    method public static float cos(float);

    method public static float exp(float);

    method public static float floor(float);

    method public static float hypot(float, float);

    method public static float pow(float, float);

    method public static float sin(float);

    method public static float sqrt(float);

    method @Deprecated public static float ceil(float);

    method @Deprecated public static float cos(float);

    method @Deprecated public static float exp(float);

    method @Deprecated public static float floor(float);

    method @Deprecated public static float hypot(float, float);

    method @Deprecated public static float pow(float, float);

    method @Deprecated public static float sin(float);

    method @Deprecated public static float sqrt(float);

  }



}

core/api/system-removed.txt

+61 −61
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ package android.app { 
  }



  @Deprecated public abstract static class AppOpsManager.AppOpsCollector extends android.app.AppOpsManager.OnOpNotedCallback {

    ctor public AppOpsManager.AppOpsCollector();

    method @NonNull public java.util.concurrent.Executor getAsyncNotedExecutor();

    ctor @Deprecated public AppOpsManager.AppOpsCollector();

    method @Deprecated @NonNull public java.util.concurrent.Executor getAsyncNotedExecutor();

  }



  public class Notification implements android.os.Parcelable {
@@ -207,7 +207,7 @@ package android.service.translation { 


  @Deprecated public static interface TranslationService.OnTranslationResultCallback {

    method @Deprecated public void onError();

    method public void onTranslationSuccess(@NonNull android.view.translation.TranslationResponse);

    method @Deprecated public void onTranslationSuccess(@NonNull android.view.translation.TranslationResponse);

  }



}
@@ -261,64 +261,64 @@ package android.telephony.ims { 
  }



  @Deprecated public final class SipDelegateImsConfiguration implements android.os.Parcelable {

    method public boolean containsKey(@NonNull String);

    method @NonNull public android.os.PersistableBundle copyBundle();

    method public int describeContents();

    method public boolean getBoolean(@NonNull String, boolean);

    method public int getInt(@NonNull String, int);

    method @Nullable public String getString(@NonNull String);

    method public long getVersion();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.SipDelegateImsConfiguration> CREATOR;

    field public static final String IPTYPE_IPV4 = "IPV4";

    field public static final String IPTYPE_IPV6 = "IPV6";

    field public static final String KEY_SIP_CONFIG_AUTHENTICATION_HEADER_STRING = "sip_config_auhentication_header_string";

    field public static final String KEY_SIP_CONFIG_AUTHENTICATION_NONCE_STRING = "sip_config_authentication_nonce_string";

    field public static final String KEY_SIP_CONFIG_CELLULAR_NETWORK_INFO_HEADER_STRING = "sip_config_cellular_network_info_header_string";

    field public static final String KEY_SIP_CONFIG_HOME_DOMAIN_STRING = "sip_config_home_domain_string";

    field public static final String KEY_SIP_CONFIG_IMEI_STRING = "sip_config_imei_string";

    field public static final String KEY_SIP_CONFIG_IPTYPE_STRING = "sip_config_iptype_string";

    field public static final String KEY_SIP_CONFIG_IS_COMPACT_FORM_ENABLED_BOOL = "sip_config_is_compact_form_enabled_bool";

    field public static final String KEY_SIP_CONFIG_IS_GRUU_ENABLED_BOOL = "sip_config_is_gruu_enabled_bool";

    field public static final String KEY_SIP_CONFIG_IS_IPSEC_ENABLED_BOOL = "sip_config_is_ipsec_enabled_bool";

    field public static final String KEY_SIP_CONFIG_IS_KEEPALIVE_ENABLED_BOOL = "sip_config_is_keepalive_enabled_bool";

    field public static final String KEY_SIP_CONFIG_IS_NAT_ENABLED_BOOL = "sip_config_is_nat_enabled_bool";

    field public static final String KEY_SIP_CONFIG_MAX_PAYLOAD_SIZE_ON_UDP_INT = "sip_config_udp_max_payload_size_int";

    field public static final String KEY_SIP_CONFIG_PATH_HEADER_STRING = "sip_config_path_header_string";

    field public static final String KEY_SIP_CONFIG_P_ACCESS_NETWORK_INFO_HEADER_STRING = "sip_config_p_access_network_info_header_string";

    field public static final String KEY_SIP_CONFIG_P_ASSOCIATED_URI_HEADER_STRING = "sip_config_p_associated_uri_header_string";

    field public static final String KEY_SIP_CONFIG_P_LAST_ACCESS_NETWORK_INFO_HEADER_STRING = "sip_config_p_last_access_network_info_header_string";

    field public static final String KEY_SIP_CONFIG_SECURITY_VERIFY_HEADER_STRING = "sip_config_security_verify_header_string";

    field public static final String KEY_SIP_CONFIG_SERVER_DEFAULT_IPADDRESS_STRING = "sip_config_server_default_ipaddress_string";

    field public static final String KEY_SIP_CONFIG_SERVER_DEFAULT_PORT_INT = "sip_config_server_default_port_int";

    field public static final String KEY_SIP_CONFIG_SERVER_IPSEC_CLIENT_PORT_INT = "sip_config_server_ipsec_client_port_int";

    field public static final String KEY_SIP_CONFIG_SERVER_IPSEC_OLD_CLIENT_PORT_INT = "sip_config_server_ipsec_old_client_port_int";

    field public static final String KEY_SIP_CONFIG_SERVER_IPSEC_SERVER_PORT_INT = "sip_config_server_ipsec_server_port_int";

    field public static final String KEY_SIP_CONFIG_SERVICE_ROUTE_HEADER_STRING = "sip_config_service_route_header_string";

    field public static final String KEY_SIP_CONFIG_TRANSPORT_TYPE_STRING = "sip_config_protocol_type_string";

    field public static final String KEY_SIP_CONFIG_UE_DEFAULT_IPADDRESS_STRING = "sip_config_ue_default_ipaddress_string";

    field public static final String KEY_SIP_CONFIG_UE_DEFAULT_PORT_INT = "sip_config_ue_default_port_int";

    field public static final String KEY_SIP_CONFIG_UE_IPSEC_CLIENT_PORT_INT = "sip_config_ue_ipsec_client_port_int";

    field public static final String KEY_SIP_CONFIG_UE_IPSEC_OLD_CLIENT_PORT_INT = "sip_config_ue_ipsec_old_client_port_int";

    field public static final String KEY_SIP_CONFIG_UE_IPSEC_SERVER_PORT_INT = "sip_config_ue_ipsec_server_port_int";

    field public static final String KEY_SIP_CONFIG_UE_PRIVATE_USER_ID_STRING = "sip_config_ue_private_user_id_string";

    field public static final String KEY_SIP_CONFIG_UE_PUBLIC_GRUU_STRING = "sip_config_ue_public_gruu_string";

    field public static final String KEY_SIP_CONFIG_UE_PUBLIC_IPADDRESS_WITH_NAT_STRING = "sip_config_ue_public_ipaddress_with_nat_string";

    field public static final String KEY_SIP_CONFIG_UE_PUBLIC_PORT_WITH_NAT_INT = "sip_config_ue_public_port_with_nat_int";

    field public static final String KEY_SIP_CONFIG_UE_PUBLIC_USER_ID_STRING = "sip_config_ue_public_user_id_string";

    field public static final String KEY_SIP_CONFIG_URI_USER_PART_STRING = "sip_config_uri_user_part_string";

    field public static final String KEY_SIP_CONFIG_USER_AGENT_HEADER_STRING = "sip_config_sip_user_agent_header_string";

    field public static final String SIP_TRANSPORT_TCP = "TCP";

    field public static final String SIP_TRANSPORT_UDP = "UDP";

  }



  public static final class SipDelegateImsConfiguration.Builder {

    ctor public SipDelegateImsConfiguration.Builder(int);

    ctor public SipDelegateImsConfiguration.Builder(@NonNull android.telephony.ims.SipDelegateImsConfiguration);

    method @NonNull public android.telephony.ims.SipDelegateImsConfiguration.Builder addBoolean(@NonNull String, boolean);

    method @NonNull public android.telephony.ims.SipDelegateImsConfiguration.Builder addInt(@NonNull String, int);

    method @NonNull public android.telephony.ims.SipDelegateImsConfiguration.Builder addString(@NonNull String, @NonNull String);

    method @NonNull public android.telephony.ims.SipDelegateImsConfiguration build();

    method @Deprecated public boolean containsKey(@NonNull String);

    method @Deprecated @NonNull public android.os.PersistableBundle copyBundle();

    method @Deprecated public int describeContents();

    method @Deprecated public boolean getBoolean(@NonNull String, boolean);

    method @Deprecated public int getInt(@NonNull String, int);

    method @Deprecated @Nullable public String getString(@NonNull String);

    method @Deprecated public long getVersion();

    method @Deprecated public void writeToParcel(@NonNull android.os.Parcel, int);

    field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.SipDelegateImsConfiguration> CREATOR;

    field @Deprecated public static final String IPTYPE_IPV4 = "IPV4";

    field @Deprecated public static final String IPTYPE_IPV6 = "IPV6";

    field @Deprecated public static final String KEY_SIP_CONFIG_AUTHENTICATION_HEADER_STRING = "sip_config_auhentication_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_AUTHENTICATION_NONCE_STRING = "sip_config_authentication_nonce_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_CELLULAR_NETWORK_INFO_HEADER_STRING = "sip_config_cellular_network_info_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_HOME_DOMAIN_STRING = "sip_config_home_domain_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_IMEI_STRING = "sip_config_imei_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_IPTYPE_STRING = "sip_config_iptype_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_IS_COMPACT_FORM_ENABLED_BOOL = "sip_config_is_compact_form_enabled_bool";

    field @Deprecated public static final String KEY_SIP_CONFIG_IS_GRUU_ENABLED_BOOL = "sip_config_is_gruu_enabled_bool";

    field @Deprecated public static final String KEY_SIP_CONFIG_IS_IPSEC_ENABLED_BOOL = "sip_config_is_ipsec_enabled_bool";

    field @Deprecated public static final String KEY_SIP_CONFIG_IS_KEEPALIVE_ENABLED_BOOL = "sip_config_is_keepalive_enabled_bool";

    field @Deprecated public static final String KEY_SIP_CONFIG_IS_NAT_ENABLED_BOOL = "sip_config_is_nat_enabled_bool";

    field @Deprecated public static final String KEY_SIP_CONFIG_MAX_PAYLOAD_SIZE_ON_UDP_INT = "sip_config_udp_max_payload_size_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_PATH_HEADER_STRING = "sip_config_path_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_P_ACCESS_NETWORK_INFO_HEADER_STRING = "sip_config_p_access_network_info_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_P_ASSOCIATED_URI_HEADER_STRING = "sip_config_p_associated_uri_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_P_LAST_ACCESS_NETWORK_INFO_HEADER_STRING = "sip_config_p_last_access_network_info_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_SECURITY_VERIFY_HEADER_STRING = "sip_config_security_verify_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_SERVER_DEFAULT_IPADDRESS_STRING = "sip_config_server_default_ipaddress_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_SERVER_DEFAULT_PORT_INT = "sip_config_server_default_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_SERVER_IPSEC_CLIENT_PORT_INT = "sip_config_server_ipsec_client_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_SERVER_IPSEC_OLD_CLIENT_PORT_INT = "sip_config_server_ipsec_old_client_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_SERVER_IPSEC_SERVER_PORT_INT = "sip_config_server_ipsec_server_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_SERVICE_ROUTE_HEADER_STRING = "sip_config_service_route_header_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_TRANSPORT_TYPE_STRING = "sip_config_protocol_type_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_DEFAULT_IPADDRESS_STRING = "sip_config_ue_default_ipaddress_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_DEFAULT_PORT_INT = "sip_config_ue_default_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_IPSEC_CLIENT_PORT_INT = "sip_config_ue_ipsec_client_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_IPSEC_OLD_CLIENT_PORT_INT = "sip_config_ue_ipsec_old_client_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_IPSEC_SERVER_PORT_INT = "sip_config_ue_ipsec_server_port_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_PRIVATE_USER_ID_STRING = "sip_config_ue_private_user_id_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_PUBLIC_GRUU_STRING = "sip_config_ue_public_gruu_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_PUBLIC_IPADDRESS_WITH_NAT_STRING = "sip_config_ue_public_ipaddress_with_nat_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_PUBLIC_PORT_WITH_NAT_INT = "sip_config_ue_public_port_with_nat_int";

    field @Deprecated public static final String KEY_SIP_CONFIG_UE_PUBLIC_USER_ID_STRING = "sip_config_ue_public_user_id_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_URI_USER_PART_STRING = "sip_config_uri_user_part_string";

    field @Deprecated public static final String KEY_SIP_CONFIG_USER_AGENT_HEADER_STRING = "sip_config_sip_user_agent_header_string";

    field @Deprecated public static final String SIP_TRANSPORT_TCP = "TCP";

    field @Deprecated public static final String SIP_TRANSPORT_UDP = "UDP";

  }



  @Deprecated public static final class SipDelegateImsConfiguration.Builder {

    ctor @Deprecated public SipDelegateImsConfiguration.Builder(int);

    ctor @Deprecated public SipDelegateImsConfiguration.Builder(@NonNull android.telephony.ims.SipDelegateImsConfiguration);

    method @Deprecated @NonNull public android.telephony.ims.SipDelegateImsConfiguration.Builder addBoolean(@NonNull String, boolean);

    method @Deprecated @NonNull public android.telephony.ims.SipDelegateImsConfiguration.Builder addInt(@NonNull String, int);

    method @Deprecated @NonNull public android.telephony.ims.SipDelegateImsConfiguration.Builder addString(@NonNull String, @NonNull String);

    method @Deprecated @NonNull public android.telephony.ims.SipDelegateImsConfiguration build();

  }



}