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

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

Ensure consistent representation of field deprecated status 

Previously, fields that were inherited from a hidden class into a
deprecated class were treated differently to its own fields. The former
were not marked as `@Deprecated` but the latter were. That behavior has
been corrected and this change updates the signature files accordingly.

Bug: 366411703
Test: m checkapi
Change-Id: I7d1975e73a9ede9198ba2c1a41f868c07dcf1d99
parent a094d316

core/api/current.txt

+23 −23
Original line number Diff line number Diff line
@@ -20396,23 +20396,23 @@ package android.hardware.fingerprint { 
    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.USE_BIOMETRIC, android.Manifest.permission.USE_FINGERPRINT}) public void authenticate(@Nullable android.hardware.fingerprint.FingerprintManager.CryptoObject, @Nullable android.os.CancellationSignal, int, @NonNull android.hardware.fingerprint.FingerprintManager.AuthenticationCallback, @Nullable android.os.Handler);

    method @Deprecated @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public boolean hasEnrolledFingerprints();

    method @Deprecated @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public boolean isHardwareDetected();

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

    field public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 3; // 0x3

    field public static final int FINGERPRINT_ACQUIRED_INSUFFICIENT = 2; // 0x2

    field public static final int FINGERPRINT_ACQUIRED_PARTIAL = 1; // 0x1

    field public static final int FINGERPRINT_ACQUIRED_TOO_FAST = 5; // 0x5

    field public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 4; // 0x4

    field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5

    field public static final int FINGERPRINT_ERROR_HW_NOT_PRESENT = 12; // 0xc

    field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1

    field public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7

    field public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; // 0x9

    field public static final int FINGERPRINT_ERROR_NO_FINGERPRINTS = 11; // 0xb

    field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4

    field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3

    field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2

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

    field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8

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

    field @Deprecated public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 3; // 0x3

    field @Deprecated public static final int FINGERPRINT_ACQUIRED_INSUFFICIENT = 2; // 0x2

    field @Deprecated public static final int FINGERPRINT_ACQUIRED_PARTIAL = 1; // 0x1

    field @Deprecated public static final int FINGERPRINT_ACQUIRED_TOO_FAST = 5; // 0x5

    field @Deprecated public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 4; // 0x4

    field @Deprecated public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5

    field @Deprecated public static final int FINGERPRINT_ERROR_HW_NOT_PRESENT = 12; // 0xc

    field @Deprecated public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1

    field @Deprecated public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7

    field @Deprecated public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; // 0x9

    field @Deprecated public static final int FINGERPRINT_ERROR_NO_FINGERPRINTS = 11; // 0xb

    field @Deprecated public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4

    field @Deprecated public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3

    field @Deprecated public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2

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

    field @Deprecated public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8

  }















  @Deprecated public abstract static class FingerprintManager.AuthenticationCallback {










@@ -36252,9 +36252,9 @@ package android.provider {













    method @Deprecated public static int getTypeLabelResource(int);















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















    field @Deprecated public static final String CUSTOM_PROTOCOL = "data6";













    field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";













    field public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";













    field public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";













    field @Deprecated public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";













    field @Deprecated public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";













    field @Deprecated public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";















    field @Deprecated public static final String PROTOCOL = "data5";















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















    field @Deprecated public static final int PROTOCOL_CUSTOM = -1; // 0xffffffff










@@ -36387,9 +36387,9 @@ package android.provider {













    method @Deprecated public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence);















    method @Deprecated public static int getTypeLabelResource(int);















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













    field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";













    field public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";













    field public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";













    field @Deprecated public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";













    field @Deprecated public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";













    field @Deprecated public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";















    field @Deprecated public static final String SIP_ADDRESS = "data1";















    field @Deprecated public static final int TYPE_HOME = 1; // 0x1















    field @Deprecated public static final int TYPE_OTHER = 3; // 0x3