commit 9b390861e72840f583b57185464d2c6f9ba50ed8
author Haofan Wang <haofanw@google.com> Thu Aug 22 17:44:59 2024 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Thu Aug 22 17:44:59 2024 +0000
tree 33589a00c82e890a1c7360ff24807230311549c5
parent 4dc976749db921cc0f34c6e1949726d5d7d6eab3

Syntax fix for AidlConversionNDK and DeviceHalHidl

Change the legacy2aidl conversion function name so it follows other
conversion methods pattern.

Change to use RETURN_STATUS_IF_ERROR for status checking in
DeviceHalHidl.

Bug: 297875432
Test: Check log message
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a26241caf00a3cad3f167f938ceac14387320117)
Merged-In: I99a592487feb0fbd6ff8f241280d32204dc6a91b
Change-Id: I99a592487feb0fbd6ff8f241280d32204dc6a91b

media/libaudiohal/impl/DeviceHalAidl.cpp

diff --git a/media/libaudiohal/impl/DeviceHalAidl.cpp b/media/libaudiohal/impl/DeviceHalAidl.cpp
index f301a77..04baf1f 100644
--- a/media/libaudiohal/impl/DeviceHalAidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalAidl.cpp
@@ -478,7 +478,7 @@
     int32_t aidlOutputFlags = VALUE_OR_RETURN_STATUS(
             ::aidl::android::legacy2aidl_audio_output_flags_t_int32_t_mask(flags));
     SourceMetadata aidlMetadata = VALUE_OR_RETURN_STATUS(
-            ::aidl::android::legacy2aidl_SourceMetadata(sourceMetadata));
+            ::aidl::android::legacy2aidl_playback_track_metadata_v7_SourceMetadata(sourceMetadata));
     AudioIoFlags aidlFlags = AudioIoFlags::make<AudioIoFlags::Tag::output>(aidlOutputFlags);
     AudioPortConfig mixPortConfig;
     AudioPatch aidlPatch;