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

Commit 1988b382 authored by Joe Bolinger's avatar Joe Bolinger
Browse files

Update fingerprint AIDL with additional display id field. 

This enables the HAL to use stable display ids (i.e. config_displayUniqueIdArray).

Bug: 174868353
Test: builds
Change-Id: Ia6b4e15ec22a431d88825af4e38605c9369d0a0b
parent 8b3ef5ab

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ java_library_static { 
        "android.hardware.weaver-V1.0-java",

        "android.hardware.biometrics.face-V1.0-java",

        "android.hardware.biometrics.fingerprint-V2.3-java",

        "android.hardware.biometrics.fingerprint-V1-java",

        "android.hardware.biometrics.fingerprint-V2-java",

        "android.hardware.oemlock-V1.0-java",

        "android.hardware.configstore-V1.1-java",

        "android.hardware.contexthub-V1.0-java",

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

+9 −5
Original line number Diff line number Diff line
@@ -72,8 +72,10 @@ import org.json.JSONObject; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.concurrent.atomic.AtomicLong;

import java.util.stream.Collectors;



/**

 * Provider for a single instance of the {@link IFingerprint} HAL.
@@ -169,11 +171,13 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi 
                            prop.sensorType,

                            true /* resetLockoutRequiresHardwareAuthToken */,

                            !workaroundLocations.isEmpty() ? workaroundLocations :

                                    List.of(new SensorLocationInternal(

                                        "" /* displayId */,

                                        prop.sensorLocations[0].sensorLocationX,

                                        prop.sensorLocations[0].sensorLocationY,

                                        prop.sensorLocations[0].sensorRadius)));

                                    Arrays.stream(prop.sensorLocations).map(location ->

                                            new SensorLocationInternal(

                                                    location.display,

                                                    location.sensorLocationX,

                                                    location.sensorLocationY,

                                                    location.sensorRadius))

                                            .collect(Collectors.toList()));

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

                    internalProp, lockoutResetDispatcher, gestureAvailabilityDispatcher);