| commit | cefe7ae2f7534a552732a4d487e50ec42033abc1 | [log] [tgz] |
|---|---|---|
| author | Hasini Gunasinghe <hasinitg@google.com> | Thu Nov 16 18:09:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 16 18:09:57 2023 +0000 |
| tree | 2f291d0d551c58c8da647e049519e1f6e3c4e7b7 | |
| parent | 58071a4166dfedb7b5bd1c7c3f4b706fae13a4f8 [diff] | |
| parent | 69efe8e7539aae345a18b907b7e4afb6c5868dba [diff] |
Merge "Update the VTS module according to the refactoring in aosp/2826571" into main am: 69efe8e753 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2827370 Change-Id: I2caf7f422161556fa4b351383d9ded0b350ab59d 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>