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

Commit 83b4abd1 authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Use UDFPS sensor location from AIDL 

Bug: 175070939
Test: on device
Test: atest FingerprintProviderTest
Change-Id: Ia64003b0b073ce68083ea3a6b9c473c74024da0b
parent 2335acd9

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

+5 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import com.android.server.biometrics.Utils; 
import com.android.server.biometrics.sensors.AuthenticationClient;

import com.android.server.biometrics.sensors.BaseClientMonitor;

import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;

import com.android.server.biometrics.sensors.HalClientMonitor;

import com.android.server.biometrics.sensors.InvalidationRequesterClient;

import com.android.server.biometrics.sensors.LockoutResetDispatcher;

import com.android.server.biometrics.sensors.PerformanceTracker;
@@ -153,7 +152,10 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi 
                            prop.commonProps.maxEnrollmentsPerUser,

                            componentInfo,

                            prop.sensorType,

                            true /* resetLockoutRequiresHardwareAuthToken */);

                            true /* resetLockoutRequiresHardwareAuthToken */,

                            prop.sensorLocations[0].sensorLocationX,

                            prop.sensorLocations[0].sensorLocationY,

                            prop.sensorLocations[0].sensorRadius);

            final Sensor sensor = new Sensor(getTag() + "/" + sensorId, this, mContext, mHandler,

                    internalProp, gestureAvailabilityDispatcher);

services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProviderTest.java

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.hardware.biometrics.common.CommonProps;

import android.hardware.biometrics.fingerprint.IFingerprint;

import android.hardware.biometrics.fingerprint.SensorLocation;

import android.hardware.biometrics.fingerprint.SensorProps;

import android.os.UserManager;

import android.platform.test.annotations.Presubmit;
@@ -33,7 +34,6 @@ import androidx.annotation.NonNull; 
import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import com.android.server.biometrics.sensors.BaseClientMonitor;

import com.android.server.biometrics.sensors.BiometricScheduler;

import com.android.server.biometrics.sensors.HalClientMonitor;

import com.android.server.biometrics.sensors.LockoutResetDispatcher;
@@ -77,9 +77,11 @@ public class FingerprintProviderTest { 
        final SensorProps sensor1 = new SensorProps();

        sensor1.commonProps = new CommonProps();

        sensor1.commonProps.sensorId = 0;

        sensor1.sensorLocations = new SensorLocation[] {new SensorLocation()};

        final SensorProps sensor2 = new SensorProps();

        sensor2.commonProps = new CommonProps();

        sensor2.commonProps.sensorId = 1;

        sensor2.sensorLocations = new SensorLocation[] {new SensorLocation()};



        mSensorProps = new SensorProps[] {sensor1, sensor2};