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

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

Merge "Allow UDFPS props to be overlayed" into sc-dev am: 2a5f2845 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id558144a2f564f9597cae38e35a5101038a0af7a
parents a34c31db 2a5f2845

core/java/android/hardware/fingerprint/FingerprintSensorPropertiesInternal.java

+31 −3
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package android.hardware.fingerprint; 
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;

import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_ULTRASONIC;



import android.annotation.NonNull;

import android.content.Context;

import android.hardware.biometrics.SensorProperties;

import android.hardware.biometrics.SensorPropertiesInternal;

import android.os.Parcel;
@@ -81,10 +83,36 @@ public class FingerprintSensorPropertiesInternal extends SensorPropertiesInterna 
            @SensorProperties.Strength int strength, int maxEnrollmentsPerUser,

            @FingerprintSensorProperties.SensorType int sensorType,

            boolean resetLockoutRequiresHardwareAuthToken) {

        // TODO: Value should be provided from the HAL

        // TODO(b/179175438): Value should be provided from the HAL

        this(sensorId, strength, maxEnrollmentsPerUser, sensorType,

                resetLockoutRequiresHardwareAuthToken, 540 /* sensorLocationX */,

                1769 /* sensorLocationY */, 130 /* sensorRadius */);

                resetLockoutRequiresHardwareAuthToken, 0 /* sensorLocationX */,

                0 /* sensorLocationY */, 0 /* sensorRadius */);

    }



    /**

     * Initializes SensorProperties with specified values and values obtained from resources using

     * context.

     */

    // TODO(b/179175438): Remove this constructor once all HALs move to AIDL.

    public FingerprintSensorPropertiesInternal(@NonNull Context context, int sensorId,

            @SensorProperties.Strength int strength, int maxEnrollmentsPerUser,

            @FingerprintSensorProperties.SensorType int sensorType,

            boolean resetLockoutRequiresHardwareAuthToken) {

        super(sensorId, strength, maxEnrollmentsPerUser);

        this.sensorType = sensorType;

        this.resetLockoutRequiresHardwareAuthToken = resetLockoutRequiresHardwareAuthToken;



        int[] props = context.getResources().getIntArray(

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

        if (props != null && props.length == 3) {

            this.sensorLocationX = props[0];

            this.sensorLocationY = props[1];

            this.sensorRadius = props[2];

        } else {

            this.sensorLocationX = 0;

            this.sensorLocationY = 0;

            this.sensorRadius = 0;

        }

    }



    protected FingerprintSensorPropertiesInternal(Parcel in) {

core/res/res/values/config.xml

+9 −0
Original line number Diff line number Diff line
@@ -4411,6 +4411,15 @@ 
    <!--If true, allows the device to load udfps components on older HIDL implementations -->

    <bool name="allow_test_udfps" translatable="false" >false</bool>



    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->

    <integer-array name="config_udfps_sensor_props" translatable="false" >

      <!--

        <item>sensorLocationX</item>

        <item>sensorLocationY</item>

        <item>sensorRadius</item>

      -->

    </integer-array>



    <!-- Messages that should not be shown to the user during face auth enrollment. This should be

         used to hide messages that may be too chatty or messages that the user can't do much about.

         Entries are defined in android.hardware.biometrics.face@1.0 types.hal -->

core/res/res/values/symbols.xml

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

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

  <java-symbol type="bool" name="allow_test_udfps" />

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



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

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

services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java

+12 −12
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider 
        final int maxEnrollmentsPerUser = mContext.getResources()

                .getInteger(R.integer.config_fingerprintMaxTemplatesPerUser);



        mSensorProperties = new FingerprintSensorPropertiesInternal(sensorId,

        mSensorProperties = new FingerprintSensorPropertiesInternal(context, sensorId,

                Utils.authenticatorStrengthToPropertyStrength(strength), maxEnrollmentsPerUser,

                sensorType, resetLockoutRequiresHardwareAuthToken);

    }