diff options
| author | Joshua Mccloskey <joshmccloskey@google.com> | 2021-06-21 20:41:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-21 20:41:01 +0000 |
| commit | 95b8d4bc80549f15acda62b76a967e2018d68bfd (patch) | |
| tree | 1f0774f16b0f3a137168ba214431256e933a11ba /core/java | |
| parent | ed9701bbc86205dbe180acf4b4b46d4342e05ee0 (diff) | |
| parent | acf6fdf0ff8ee746810a7966c0af9a9f6a7624ce (diff) | |
Merge "Added fingerprint_bad_calibration." into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/biometrics/BiometricFingerprintConstants.java | 9 | ||||
| -rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintManager.java | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java index 79f716cd5ce9..2d46a4073809 100644 --- a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java +++ b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java @@ -60,7 +60,8 @@ public interface BiometricFingerprintConstants { BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED, BIOMETRIC_ERROR_RE_ENROLL, BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED, - FINGERPRINT_ERROR_UNKNOWN}) + FINGERPRINT_ERROR_UNKNOWN, + FINGERPRINT_ERROR_BAD_CALIBARTION}) @Retention(RetentionPolicy.SOURCE) @interface FingerprintError {} @@ -181,6 +182,12 @@ public interface BiometricFingerprintConstants { int FINGERPRINT_ERROR_UNKNOWN = 17; /** + * Error indicating that the fingerprint sensor has bad calibration. + * @hide + */ + int FINGERPRINT_ERROR_BAD_CALIBARTION = 18; + + /** * @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index e5946663df47..688f9f1174dd 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -1375,6 +1375,9 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing case BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED: return context.getString( com.android.internal.R.string.fingerprint_error_security_update_required); + case FINGERPRINT_ERROR_BAD_CALIBARTION: + context.getString( + com.android.internal.R.string.fingerprint_error_bad_calibration); case FINGERPRINT_ERROR_VENDOR: { String[] msgArray = context.getResources().getStringArray( com.android.internal.R.array.fingerprint_error_vendor); |