mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 11:36:00 +00:00
Merge "Update sensor properties: (1) Add software information (eg, matching and PAD algorithm versions) (2) Remove firmware version from hardware information" into sc-dev
This commit is contained in:
@@ -12,7 +12,8 @@
|
||||
* 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.
|
||||
*////////////////////////////////////////////////////////////////////////////////
|
||||
*/
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -37,4 +38,5 @@ parcelable CommonProps {
|
||||
android.hardware.biometrics.common.SensorStrength sensorStrength = android.hardware.biometrics.common.SensorStrength.CONVENIENCE;
|
||||
int maxEnrollmentsPerUser;
|
||||
android.hardware.biometrics.common.HardwareInfo[] hardwareInfo;
|
||||
String softwareInfo;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
* 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.
|
||||
*////////////////////////////////////////////////////////////////////////////////
|
||||
*/
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -35,6 +36,5 @@ package android.hardware.biometrics.common;
|
||||
parcelable HardwareInfo {
|
||||
String deviceName;
|
||||
String hardwareVersion;
|
||||
String firmwareVersion;
|
||||
String serialNumber;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
* 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.
|
||||
*////////////////////////////////////////////////////////////////////////////////
|
||||
*/
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
* 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.
|
||||
*////////////////////////////////////////////////////////////////////////////////
|
||||
*/
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@@ -44,4 +44,13 @@ parcelable CommonProps {
|
||||
* A list of hardware information for subsystems that pertain to this biometric sensor.
|
||||
*/
|
||||
HardwareInfo[] hardwareInfo;
|
||||
|
||||
/**
|
||||
* Software information for subsystems that pertain to this biometric sensor.
|
||||
* This may include information for the matching algorithm, the PAD (Presentation Attack
|
||||
* Detection) algorithm, and any other algorithm(s) used by this biometric sensor.
|
||||
* For example, <algorithm_1_info>;<algorithm_2_info>;<algorithm_3_info>.
|
||||
* The format of each algorithm's info can be <vendor>/<algorithm>/<version>.
|
||||
*/
|
||||
String softwareInfo;
|
||||
}
|
||||
|
||||
@@ -28,13 +28,8 @@ parcelable HardwareInfo {
|
||||
*/
|
||||
String hardwareVersion;
|
||||
|
||||
/**
|
||||
* The firmware version.
|
||||
*/
|
||||
String firmwareVersion;
|
||||
|
||||
/**
|
||||
* The sensor's serial number.
|
||||
*/
|
||||
String serialNumber;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user