Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added fingerprint_bad_calibration." into sc-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-06-21 20:41:01 +00:00
committed by Android (Google) Code Review
parent ed9701bbc8 acf6fdf0ff
commit 95b8d4bc80
5 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/hardware/biometrics/BiometricFingerprintConstants.java
View File

@@ -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 {}
@@ -180,6 +181,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
*/

3
core/java/android/hardware/fingerprint/FingerprintManager.java
View File

@@ -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);

2
core/res/res/values/strings.xml
View File

@@ -1636,6 +1636,8 @@
<string name="fingerprint_error_hw_not_present">This device does not have a fingerprint sensor.</string>
<!-- Generic error message shown when fingerprint is not available due to a security vulnerability. [CHAR LIMIT=50] -->
<string name="fingerprint_error_security_update_required">Sensor temporarily disabled.</string>
<!-- Generic error message shown when fingerprint needs calibration [CHAR LIMIT=50] -->
<string name="fingerprint_error_bad_calibration">Sensor needs calibration</string>
<!-- Template to be used to name enrolled fingerprints by default. -->
<string name="fingerprint_name_template">Finger <xliff:g id="fingerId" example="1">%d</xliff:g></string>

1
core/res/res/values/symbols.xml
View File

@@ -2537,6 +2537,7 @@
<java-symbol type="string" name="fingerprint_error_no_fingerprints" />
<java-symbol type="string" name="fingerprint_error_hw_not_present" />
<java-symbol type="string" name="fingerprint_error_security_update_required" />
<java-symbol type="string" name="fingerprint_error_bad_calibration" />
<!-- Fingerprint config -->
<java-symbol type="integer" name="config_fingerprintMaxTemplatesPerUser"/>

2
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java
View File

@@ -46,6 +46,8 @@ final class AidlConversionUtils {
return BiometricFingerprintConstants.FINGERPRINT_ERROR_UNABLE_TO_REMOVE;
} else if (aidlError == Error.VENDOR) {
return BiometricFingerprintConstants.FINGERPRINT_ERROR_VENDOR;
} else if (aidlError == Error.BAD_CALIBRATION) {
return BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBARTION;
} else {
return BiometricFingerprintConstants.FINGERPRINT_ERROR_UNKNOWN;
}