| commit | 43c2a823beba7ed3897e33b009e7792a31ef8307 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Wed Nov 15 04:06:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 15 04:06:02 2023 +0000 |
| tree | 9342b0862d7af10b7c68e84eef9b0190ee6bdba9 | |
| parent | dd10e1ec2c281fb7c1e758b31948a1b0c432590d [diff] | |
| parent | 4cf75592a3a196c1f8289e3f94e53b4130cffbdb [diff] |
Merge "frameCountFromDurationUs: Avoid integer overflow" into main am: 4cf75592a3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824592 Change-Id: Ibb7f67de36967b1b7775217536fdb2b5deabdd07 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>