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

Commit 9fa81d23 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Unhide several Fingerprint APIs"

parents b0bcf793 d14099d2

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -15851,9 +15851,12 @@ package android.hardware.fingerprint { 
    field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5

    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_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_UNABLE_TO_REMOVE = 6; // 0x6

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

  }















  public static abstract class FingerprintManager.AuthenticationCallback {

























api/system-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -16663,9 +16663,12 @@ package android.hardware.fingerprint {













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















    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_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_UNABLE_TO_REMOVE = 6; // 0x6













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















  }





























  public static abstract class FingerprintManager.AuthenticationCallback {

























api/test-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -15904,9 +15904,12 @@ package android.hardware.fingerprint {













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















    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_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_UNABLE_TO_REMOVE = 6; // 0x6













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















  }





























  public static abstract class FingerprintManager.AuthenticationCallback {

























core/java/android/hardware/fingerprint/FingerprintManager.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -99,8 +99,6 @@ public class FingerprintManager {













    /**















     * The {@link FingerprintManager#remove} call failed. Typically this will happen when the















     * provided fingerprint id was incorrect.













     *













     * @hide















     */















    public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6;

























@@ -112,7 +110,6 @@ public class FingerprintManager {













    /**















     * Hardware vendors may extend this list if there are conditions that do not fall under one of















     * the above categories. Vendors are responsible for providing error strings for these errors.













     * @hide















     */















    public static final int FINGERPRINT_ERROR_VENDOR = 8;

























@@ -120,7 +117,6 @@ public class FingerprintManager {













     * The operation was canceled because FINGERPRINT_ERROR_LOCKOUT occurred too many times.















     * Fingerprint authentication is disabled until the user unlocks with strong authentication















     * (PIN/Pattern/Password)













     * @hide















     */















    public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9;