| commit | d84af5ce7f7c1ffb51f20cc6e502d2debbfcfc4c | [log] [tgz] |
|---|---|---|
| author | Ilya Matyukhin <ilyamaty@google.com> | Thu Apr 22 23:52:36 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 22 23:52:36 2021 +0000 |
| tree | 55f8e2bf055d393de9c4cf389b58629597e76f69 | |
| parent | d85ab6f7a713ffa46c4558f638e6595a77aae7b1 [diff] | |
| parent | 3d1d3e6f54fbb4175760663a603b16c44e7c74aa [diff] |
Merge "Add previewDisplayId to SensorProps" into sc-dev
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 e6ea9f9..8b3c51b 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.UNKNOWN; boolean halControlsPreview; + int previewDisplayId; int enrollPreviewWidth; int enrollPreviewHeight; float enrollTranslationX;
diff --git a/biometrics/face/aidl/android/hardware/biometrics/face/SensorProps.aidl b/biometrics/face/aidl/android/hardware/biometrics/face/SensorProps.aidl index 994324d..5f881ca 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. */