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

Commit 073ea727 authored by Haining Chen's avatar Haining Chen Committed by Automerger Merge Worker
Browse files

Merge "Update sensor properties: (1) Add software information (eg, matching... 

Merge "Update sensor properties: (1) Add software information (eg, matching and PAD algorithm versions) (2) Remove firmware version from hardware information" into sc-dev am: 6fce94de

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13680608

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0afbeecc038d8b6db2903e5c7fd9a46cff189e54
parents 7524fba2 6fce94de

biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/CommonProps.aidl

+3 −1
Original line number Diff line number Diff line
@@ -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;

}

biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/HardwareInfo.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/ICancellationSignal.aidl

+2 −1
Original line number Diff line number Diff line
@@ -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.                          //

///////////////////////////////////////////////////////////////////////////////

biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/SensorStrength.aidl

+2 −1
Original line number Diff line number Diff line
@@ -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.                          //

///////////////////////////////////////////////////////////////////////////////

biometrics/common/aidl/android/hardware/biometrics/common/CommonProps.aidl

+9 −0
Original line number Diff line number Diff line
@@ -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;

}