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

Commit acf6fdf0 authored by Joshua Mccloskey's avatar Joshua Mccloskey
Browse files

Added fingerprint_bad_calibration. 

Test: Verified error message shows up during enrollment.
Bug: 189133688
Change-Id: I36737bd3b8ab5f445eac98ec40e7c9ba8e2dd2ee
parent f12e42de

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

+8 −1
Original line number Diff line number Diff line
@@ -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

     */

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

+3 −0
Original line number Diff line number Diff line
@@ -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);

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2536,6 +2536,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"/>

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

+2 −0
Original line number Diff line number Diff line
@@ -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;

        }