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

Commit a507fc4b authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev am: fb8e9b90 

am: 8ad2bd4b

Change-Id: Ic25a7a89485ec1791befafd4933a8cdd3741ce2e
parents a9500872 8ad2bd4b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15865,6 +15865,7 @@ package android.hardware.fingerprint { 
    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

  }

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -16619,6 +16619,7 @@ package android.hardware.fingerprint {













    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















  }







































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -15951,6 +15951,7 @@ package android.hardware.fingerprint {













    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















  }







































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



+7
−0




























Original line number
Diff line number
Diff line








@@ -127,6 +127,13 @@ public class FingerprintManager {













     */















    public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9;





























    /**













     * The user canceled the operation. Upon receiving this, applications should use alternate













     * authentication (e.g. a password). The application should also provide the means to return













     * to fingerprint authentication, such as a "use fingerprint" button.













     */













    public static final int FINGERPRINT_ERROR_USER_CANCELED = 10;





























    /**















     * @hide















     */