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

Commit ab2762d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Added fingerprint acquire immobile message" into sc-dev am: 64e22ca0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15017991

Change-Id: I2daedc85865be19b3dd51448dfd7d1d9e40978f3
parents 70e09b66 64e22ca0

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

+10 −1
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ public interface BiometricFingerprintConstants { 
            FINGERPRINT_ACQUIRED_TOO_FAST,

            FINGERPRINT_ACQUIRED_VENDOR,

            FINGERPRINT_ACQUIRED_START,

            FINGERPRINT_ACQUIRED_UNKNOWN})

            FINGERPRINT_ACQUIRED_UNKNOWN,

            FINGERPRINT_ACQUIRED_IMMOBILE})

    @Retention(RetentionPolicy.SOURCE)

    @interface FingerprintAcquired {}
@@ -277,6 +278,14 @@ public interface BiometricFingerprintConstants { 
     */

    int FINGERPRINT_ACQUIRED_UNKNOWN = 8;



    /**

     * This message may be sent during enrollment if the same area of the finger has already

     * been captured during this enrollment session. In general, enrolling multiple areas of the

     * same finger can help against false rejections.

     * @hide

     */

    int FINGERPRINT_ACQUIRED_IMMOBILE = 9;



    /**

     * @hide

     */

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

+3 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,9 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
            case FINGERPRINT_ACQUIRED_TOO_FAST:

                return context.getString(

                    com.android.internal.R.string.fingerprint_acquired_too_fast);

            case FINGERPRINT_ACQUIRED_IMMOBILE:

                return context.getString(

                    com.android.internal.R.string.fingerprint_acquired_immobile);

            case FINGERPRINT_ACQUIRED_VENDOR: {

                String[] msgArray = context.getResources().getStringArray(

                        com.android.internal.R.array.fingerprint_acquired_vendor);

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1603,6 +1603,8 @@ 
    <string name="fingerprint_acquired_too_bright">Too bright</string>

    <!-- Message shown during fingerprint acquisition when a fingerprint must be adjusted.[CHAR LIMIT=50] -->

    <string name="fingerprint_acquired_try_adjusting">Try adjusting</string>

    <!-- Message shown during fingerprint acquisition when a fingeprint area has already been captured during enrollment [CHAR LIMIT=100] -->

    <string name="fingerprint_acquired_immobile">Change the position of your finger slightly each time</string>

    <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->

    <string-array name="fingerprint_acquired_vendor">

    </string-array>

core/res/res/values/symbols.xml

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

  <java-symbol type="string" name="fingerprint_acquired_immobile" />



  <!-- Fingerprint config -->

  <java-symbol type="integer" name="config_fingerprintMaxTemplatesPerUser"/>

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

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ final class AidlConversionUtils { 
            // No framework constant available

            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN;

        } else if (aidlAcquiredInfo == AcquiredInfo.IMMOBILE) {

            // No framework constant available

            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN;

            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMMOBILE;

        } else if (aidlAcquiredInfo == AcquiredInfo.RETRYING_CAPTURE) {

            // No framework constant available

            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN;