commit dca65ce30762c7ef8c90157b112edbbe2186d844
author Shunkai Yao <yaoshunkai@google.com> Fri Dec 02 05:35:41 2022 +0000
committer Shunkai Yao <yaoshunkai@google.com> Sat Dec 10 06:48:02 2022 +0000
tree 6586c001d4642a97c00a0bc8a1e98e5b3f58c315
parent 4cc10153957216fee289c6a40d159ba002113e99

Update libaudiohal with AudioHalVersionInfo

Bug: 261129656
Test: atest VtsHalAudioEffectTargetTest
Flash to Cuttlefish and Panther and check audio.

Merged-In: Ieace37b25dc03d50048b35b1c63b4ec5f39257c8
Change-Id: Ieace37b25dc03d50048b35b1c63b4ec5f39257c8

media/libaudiohal/impl/DevicesFactoryHalHidl.cpp

diff --git a/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp b/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp
index 4069a6b..9f06f83 100644
--- a/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp
+++ b/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp
@@ -29,6 +29,7 @@
 #include "DeviceHalHidl.h"
 #include "DevicesFactoryHalHidl.h"
 
+using ::android::detail::AudioHalVersionInfo;
 using ::android::hardware::audio::CPP_VERSION::IDevice;
 using ::android::hardware::audio::CORE_TYPES_CPP_VERSION::Result;
 using ::android::hardware::Return;
@@ -226,8 +227,13 @@
     return mDeviceFactories;
 }
 
+
+AudioHalVersionInfo DevicesFactoryHalHidl::getHalVersion() const {
+    return AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, MAJOR_VERSION, MINOR_VERSION);
+}
+
 // Main entry-point to the shared library.
-extern "C" __attribute__((visibility("default"))) void* createIDevicesFactory() {
+extern "C" __attribute__((visibility("default"))) void* createIDevicesFactoryImpl() {
     auto service = hardware::audio::CPP_VERSION::IDevicesFactory::getService();
     return service ? new DevicesFactoryHalHidl(service) : nullptr;
 }