| commit | 1051ee0bafece3ee8305b591a1c676d5f3783b7b | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Nov 15 07:45:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 15 07:45:01 2023 +0000 |
| tree | 372bb6851c7b0e9550eddaeb5d7863dc3dae8c34 | |
| parent | 215fe5f57b4257a9d9b90808951b9e2d6dd46aa1 [diff] | |
| parent | 43d4e6fdb7bcca6c23b008786b47bfaedaed7a90 [diff] |
Merge "HIDL multithreaded: increase timeout duration" into main am: 43d4e6fdb7 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2828485 Change-Id: I378b0fd57ded7af3883e2e0a1db3c9d11bb57778 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>