| commit | 58071a4166dfedb7b5bd1c7c3f4b706fae13a4f8 | [log] [tgz] |
|---|---|---|
| author | Avichal Rakesh <arakesh@google.com> | Wed Nov 15 22:44:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 15 22:44:38 2023 +0000 |
| tree | 5853f33fb7d97f4364fe31e7ce1c1a65b205a68d | |
| parent | 8139fb7098fa788be236cf46c2dd7152acc487a0 [diff] | |
| parent | 634ecd5da01dd30c7ee7365fcf8d88cf884d4d83 [diff] |
Merge "ExternalCameraHAL: Fix memory leak when copying buffer fence" into main am: 634ecd5da0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2817883 Change-Id: Ic9237e2adc2bc384b0ef8d9f9c3bbee690d143aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/vts/ModuleConfig.cpp b/audio/aidl/vts/ModuleConfig.cpp index a633d83..2b86271 100644 --- a/audio/aidl/vts/ModuleConfig.cpp +++ b/audio/aidl/vts/ModuleConfig.cpp
@@ -17,6 +17,9 @@ #include <algorithm> #include <chrono> +#define LOG_TAG "VtsHalAudio.ModuleConfig" +#include <android-base/logging.h> + #include <Utils.h> #include <aidl/android/media/audio/common/AudioInputFlags.h> #include <aidl/android/media/audio/common/AudioIoFlags.h>
diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml index 83d2665..523d8de 100644 --- a/compatibility_matrices/compatibility_matrix.9.xml +++ b/compatibility_matrices/compatibility_matrix.9.xml
@@ -574,6 +574,14 @@ </interface> </hal> <hal format="aidl" optional="true"> + <name>android.hardware.threadnetwork</name> + <version>1</version> + <interface> + <name>IThreadChip</name> + <instance>chip0</instance> + </interface> + </hal> + <hal format="aidl" optional="true"> <name>android.hardware.tv.hdmi.cec</name> <version>1</version> <interface>