| commit | 215fe5f57b4257a9d9b90808951b9e2d6dd46aa1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 15 06:34:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 15 06:34:36 2023 +0000 |
| tree | 3fc039cf4b7251652f712e02fed976619ea1d961 | |
| parent | 43c2a823beba7ed3897e33b009e7792a31ef8307 [diff] | |
| parent | abe08ca9fe5a9e7a8db5a1d00effb1d889b8f276 [diff] |
Merge "Refactored automotiveCanV1.0_fuzzer" into main am: abe08ca9fe Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2761765 Change-Id: Ida84909916c76a16e6192dcd5f829c7ec9dd9a80 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>