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

Commit 91e7a3dc authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Add hidden negative button constants 

The support library was recently merged in frameworks/support, and exposes
the negative button action through an onError message (instead of an
OnClickListener). These change adds a placeholder in frameworks/base
so that the constants are kept in sync.

Fixes: 77969138

Test: builds
Change-Id: Ic1d142006c09e1d4b9149540554e4f068e666798
parent aa580f4e

core/java/android/hardware/biometrics/BiometricConstants.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,10 @@ package android.hardware.biometrics; 




/**

/**

 * Interface containing all of the biometric modality agnostic constants.

 * Interface containing all of the biometric modality agnostic constants.

 *

 * NOTE: The error messages must be consistent between BiometricConstants, Biometric*Constants,

 *       and the frameworks/support/biometric/.../BiometricConstants files.

 *

 * @hide

 * @hide

 */

 */

public interface BiometricConstants {

public interface BiometricConstants {
@@ -105,6 +109,13 @@ public interface BiometricConstants { 
     */

     */

    int BIOMETRIC_ERROR_HW_NOT_PRESENT = 12;

    int BIOMETRIC_ERROR_HW_NOT_PRESENT = 12;





    /**

     * The user pressed the negative button. This is a placeholder that is currently only used

     * by the support library.

     * @hide

     */

    int BIOMETRIC_ERROR_NEGATIVE_BUTTON = 13;



    /**

    /**

     * @hide

     * @hide

     */

     */

core/java/android/hardware/biometrics/BiometricFaceConstants.java

+22 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,10 @@ import android.hardware.face.FaceManager; 




/**

/**

 * Interface containing all of the face-specific constants.

 * Interface containing all of the face-specific constants.

 *

 * NOTE: The error messages must be consistent between BiometricConstants, Biometric*Constants,

 *       and the frameworks/support/biometric/.../BiometricConstants files.

 *

 * @hide

 * @hide

 */

 */

public interface BiometricFaceConstants {

public interface BiometricFaceConstants {
@@ -31,27 +35,32 @@ public interface BiometricFaceConstants { 
     * The hardware is unavailable. Try again later.

     * The hardware is unavailable. Try again later.

     */

     */

    public static final int FACE_ERROR_HW_UNAVAILABLE = 1;

    public static final int FACE_ERROR_HW_UNAVAILABLE = 1;



    /**

    /**

     * Error state returned when the sensor was unable to process the current image.

     * Error state returned when the sensor was unable to process the current image.

     */

     */

    public static final int FACE_ERROR_UNABLE_TO_PROCESS = 2;

    public static final int FACE_ERROR_UNABLE_TO_PROCESS = 2;



    /**

    /**

     * Error state returned when the current request has been running too long. This is intended to

     * Error state returned when the current request has been running too long. This is intended to

     * prevent programs from waiting for the face authentication sensor indefinitely. The timeout is

     * prevent programs from waiting for the face authentication sensor indefinitely. The timeout is

     * platform and sensor-specific, but is generally on the order of 30 seconds.

     * platform and sensor-specific, but is generally on the order of 30 seconds.

     */

     */

    public static final int FACE_ERROR_TIMEOUT = 3;

    public static final int FACE_ERROR_TIMEOUT = 3;



    /**

    /**

     * Error state returned for operations like enrollment; the operation cannot be completed

     * Error state returned for operations like enrollment; the operation cannot be completed

     * because there's not enough storage remaining to complete the operation.

     * because there's not enough storage remaining to complete the operation.

     */

     */

    public static final int FACE_ERROR_NO_SPACE = 4;

    public static final int FACE_ERROR_NO_SPACE = 4;



    /**

    /**

     * The operation was canceled because the face authentication sensor is unavailable. For

     * The operation was canceled because the face authentication sensor is unavailable. For

     * example, this may happen when the user is switched, the device is locked or another pending

     * example, this may happen when the user is switched, the device is locked or another pending

     * operation prevents or disables it.

     * operation prevents or disables it.

     */

     */

    public static final int FACE_ERROR_CANCELED = 5;

    public static final int FACE_ERROR_CANCELED = 5;



    /**

    /**

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

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

     * provided face id was incorrect.

     * provided face id was incorrect.
@@ -59,11 +68,13 @@ public interface BiometricFaceConstants { 
     * @hide

     * @hide

     */

     */

    public static final int FACE_ERROR_UNABLE_TO_REMOVE = 6;

    public static final int FACE_ERROR_UNABLE_TO_REMOVE = 6;



    /**

    /**

     * The operation was canceled because the API is locked out due to too many attempts.

     * The operation was canceled because the API is locked out due to too many attempts.

     * This occurs after 5 failed attempts, and lasts for 30 seconds.

     * This occurs after 5 failed attempts, and lasts for 30 seconds.

     */

     */

    public static final int FACE_ERROR_LOCKOUT = 7;

    public static final int FACE_ERROR_LOCKOUT = 7;



    /**

    /**

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

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

     * the above categories. Vendors are responsible for providing error strings for these errors.
@@ -80,22 +91,33 @@ public interface BiometricFaceConstants { 
     * (PIN/Pattern/Password)

     * (PIN/Pattern/Password)

     */

     */

    public static final int FACE_ERROR_LOCKOUT_PERMANENT = 9;

    public static final int FACE_ERROR_LOCKOUT_PERMANENT = 9;



    /**

    /**

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

     * 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

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

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

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

     */

     */

    public static final int FACE_ERROR_USER_CANCELED = 10;

    public static final int FACE_ERROR_USER_CANCELED = 10;



    /**

    /**

     * The user does not have a face enrolled.

     * The user does not have a face enrolled.

     */

     */

    public static final int FACE_ERROR_NOT_ENROLLED = 11;

    public static final int FACE_ERROR_NOT_ENROLLED = 11;



    /**

    /**

     * The device does not have a face sensor. This message will propagate if the calling app

     * The device does not have a face sensor. This message will propagate if the calling app

     * ignores the result from PackageManager.hasFeature(FEATURE_FACE) and calls

     * ignores the result from PackageManager.hasFeature(FEATURE_FACE) and calls

     * this API anyway. Apps should always check for the feature before calling this API.

     * this API anyway. Apps should always check for the feature before calling this API.

     */

     */

    public static final int FACE_ERROR_HW_NOT_PRESENT = 12;

    public static final int FACE_ERROR_HW_NOT_PRESENT = 12;



    /**

     * The user pressed the negative button. This is a placeholder that is currently only used

     * by the support library.

     * @hide

     */

    public static final int FACE_ERROR_NEGATIVE_BUTTON = 13;



    /**

    /**

     * @hide

     * @hide

     */

     */

core/java/android/hardware/biometrics/BiometricFingerprintConstants.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,10 @@ import android.hardware.fingerprint.FingerprintManager; 




/**

/**

 * Interface containing all of the fingerprint-specific constants.

 * Interface containing all of the fingerprint-specific constants.

 *

 * NOTE: The error messages must be consistent between BiometricConstants, Biometric*Constants,

 *       and the frameworks/support/biometric/.../BiometricConstants files.

 *

 * @hide

 * @hide

 */

 */

public interface BiometricFingerprintConstants {

public interface BiometricFingerprintConstants {
@@ -106,6 +110,13 @@ public interface BiometricFingerprintConstants { 
     */

     */

    public static final int FINGERPRINT_ERROR_HW_NOT_PRESENT = 12;

    public static final int FINGERPRINT_ERROR_HW_NOT_PRESENT = 12;





    /**

     * The user pressed the negative button. This is a placeholder that is currently only used

     * by the support library.

     * @hide

     */

    public static final int FINGERPRINT_ERROR_NEGATIVE_BUTTON = 13;



    /**

    /**

     * @hide

     * @hide

     */

     */