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

Commit 4245a3b9 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes I2a96a46d,Ia8323a11,I3dba8e7e

* changes:
  Add HardwareInfo to CommonProps
  Add sensorLocation, sensorRadius, displayId to SensorProps
  Add authenticatorId changes to Fingerprint aidl
parents d6db1312 c306b76f
Loading
Loading
Loading
Loading

biometrics/README.md

0 → 100644
+12 −0
Original line number Diff line number Diff line
## Biometric HALs ##
---

## Overview: ##

The interfaces within the biometrics.* HAL tree are used by the Android Biometric Services
(e.g. FingerprintService, FaceService) to discover and operate biometric sensors on the device.

More details and versioning information can be found within each particular HAL.

More complete information about the Android Biometric HALs and subsystem can be found at
[source.android.com](https://source.android.com/security/biometric).
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ parcelable CommonProps {
  int sensorId;
  android.hardware.biometrics.common.SensorStrength sensorStrength;
  int maxEnrollmentsPerUser;
  android.hardware.biometrics.common.HardwareInfo[] hardwareInfo;
}
+25 −0
Original line number Diff line number Diff line
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
// edit this file. It looks like you are doing that because you have modified
// an AIDL interface in a backward-incompatible way, e.g., deleting a function
// from an interface or a field from a parcelable and it broke the build. That
// breakage is intended.
//
// You must not make a backward incompatible changes to the AIDL files built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.biometrics.common;
@VintfStability
parcelable HardwareInfo {
  String deviceName;
  String hardwareVersion;
  String firmwareVersion;
  String serialNumber;
}
+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package android.hardware.biometrics.common;

import android.hardware.biometrics.common.HardwareInfo;
import android.hardware.biometrics.common.SensorStrength;

@VintfStability
@@ -40,4 +41,10 @@ parcelable CommonProps {
     * Statically configured.
     */
    int maxEnrollmentsPerUser;

    /**
     * A list of hardware information for subsystems that pertain to this
     * biometric sensor.
     */
    HardwareInfo[] hardwareInfo;
}
 No newline at end of file
+40 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2020 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.hardware.biometrics.common;

@VintfStability
parcelable HardwareInfo {
    /**
     * An identifier uniquely identifying a subsystem.
     */
    String deviceName;

    /**
     * The hardware version. For example, <vendor>/<model>/<revision>.
     */
    String hardwareVersion;

    /**
     * The firmware version.
     */
    String firmwareVersion;

    /**
     * The sensor's serial number.
     */
    String serialNumber;
}
 No newline at end of file
Loading