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:
Haining Chen
2021-03-05 20:37:33 +00:00
committed by Android (Google) Code Review
25 changed files with 60 additions and 41 deletions

View File

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

View File

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

View File

@@ -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. //
///////////////////////////////////////////////////////////////////////////////

View File

@@ -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. //
///////////////////////////////////////////////////////////////////////////////

View File

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

View File

@@ -28,13 +28,8 @@ parcelable HardwareInfo {
*/
String hardwareVersion;
/**
* The firmware version.
*/
String firmwareVersion;
/**
* The sensor's serial number.
*/
String serialNumber;
}
}