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

Commit e40bc795 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Added fingerprint acquired too bright" into sc-dev am: 24a0b944 

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

Change-Id: I1f7d8ba337685747f791774f7e14038ea1bd226e
parents 9dc63b55 24a0b944

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

+9 −1
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ public interface BiometricFingerprintConstants { 
            FINGERPRINT_ACQUIRED_VENDOR,

            FINGERPRINT_ACQUIRED_START,

            FINGERPRINT_ACQUIRED_UNKNOWN,

            FINGERPRINT_ACQUIRED_IMMOBILE})

            FINGERPRINT_ACQUIRED_IMMOBILE,

            FINGERPRINT_ACQUIRED_TOO_BRIGHT})

    @Retention(RetentionPolicy.SOURCE)

    @interface FingerprintAcquired {}
@@ -286,6 +287,13 @@ public interface BiometricFingerprintConstants { 
     */

    int FINGERPRINT_ACQUIRED_IMMOBILE = 9;



    /**

     * For sensors that require illumination, such as optical under-display fingerprint sensors,

     * the image was too bright to be used for matching.

     * @hide

     */

    int FINGERPRINT_ACQUIRED_TOO_BRIGHT = 10;



    /**

     * @hide

     */

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

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

                return context.getString(

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

            case FINGERPRINT_ACQUIRED_TOO_BRIGHT:

                return context.getString(

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

            case FINGERPRINT_ACQUIRED_VENDOR: {

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

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

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2528,6 +2528,7 @@ 
  <java-symbol type="string" name="fingerprint_acquired_imager_dirty" />

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

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

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

  <java-symbol type="array" name="fingerprint_acquired_vendor" />

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

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

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUtils.java

+4 −0
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ package com.android.server.biometrics.sensors.fingerprint; 


import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_GOOD;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMAGER_DIRTY;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMMOBILE;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_INSUFFICIENT;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_PARTIAL;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_START;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_BRIGHT;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_FAST;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_SLOW;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR;
@@ -188,6 +190,8 @@ public class FingerprintUtils implements BiometricUtils<Fingerprint> { 
            case FINGERPRINT_ACQUIRED_TOO_FAST:

            case FINGERPRINT_ACQUIRED_VENDOR:

            case FINGERPRINT_ACQUIRED_START:

            case FINGERPRINT_ACQUIRED_TOO_BRIGHT:

            case FINGERPRINT_ACQUIRED_IMMOBILE:

                return true;



            default:

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

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ final class AidlConversionUtils { 
            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN;

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

            // No framework constant available

            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN;

            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_BRIGHT;

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

            return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMMOBILE;

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