commit 3d1d3e6f54fbb4175760663a603b16c44e7c74aa
author Ilya Matyukhin <ilyamaty@google.com> Thu Apr 22 16:30:42 2021 -0700
committer Ilya Matyukhin <ilyamaty@google.com> Thu Apr 22 16:31:17 2021 -0700
tree 28fc06508a24c7cf2c9d12e647ff2c00a94035b7
parent 2906d566ec34fda83ac4f6e61383ea7a7d856543

Add previewDisplayId to SensorProps

Bug: 183738533
Test: m android.hardware.biometrics.face-update-api
Change-Id: Ia0703815d2aaa616d6e8b8f607bfe6e905ffdb7f

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/SensorProps.aidl

diff --git a/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/SensorProps.aidl b/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/SensorProps.aidl
index c55a600..c4765d5 100644
--- a/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/SensorProps.aidl
+++ b/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/SensorProps.aidl
@@ -37,6 +37,7 @@
   android.hardware.biometrics.common.CommonProps commonProps;
   android.hardware.biometrics.face.FaceSensorType sensorType = android.hardware.biometrics.face.FaceSensorType.RGB;
   boolean halControlsPreview;
+  int previewDisplayId;
   int enrollPreviewWidth;
   int enrollPreviewHeight;
   float enrollTranslationX;

biometrics/face/aidl/android/hardware/biometrics/face/SensorProps.aidl

diff --git a/biometrics/face/aidl/android/hardware/biometrics/face/SensorProps.aidl b/biometrics/face/aidl/android/hardware/biometrics/face/SensorProps.aidl
index b11b436..ee98d74 100644
--- a/biometrics/face/aidl/android/hardware/biometrics/face/SensorProps.aidl
+++ b/biometrics/face/aidl/android/hardware/biometrics/face/SensorProps.aidl
@@ -41,6 +41,13 @@
     boolean halControlsPreview;
 
     /**
+     * The ID of the display that's used for enrollment preview. This must correspond to the
+     * android.hardware.DisplayManager#getDisplay Android API. This is useful for devices with
+     * multiple displays to ensure the correct display is used for this face sensor.
+     */
+    int previewDisplayId;
+
+    /**
      * For implementations where the HAL manages the preview, this is the width, in pixels, of each
      * frame that the camera is set up to output.
      */