Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update fingerprint AIDL with additional display id field."

Browse Source
This commit is contained in:
Joe Bolinger
2021-11-03 01:30:57 +00:00
committed by Android (Google) Code Review
parent 3ba1e6ce09 1988b3825b
commit 49f9cdc27b
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/Android.bp
View File

@@ -157,7 +157,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",

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

@@ -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);