| commit | 9b390861e72840f583b57185464d2c6f9ba50ed8 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
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
diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp index b48c7ed..0a262e4 100644 --- a/media/libaudiohal/impl/DeviceHalHidl.cpp +++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -280,11 +280,9 @@ ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION::SourceMetadata hidlMetadata; #endif - if (status_t status = CoreUtils::sourceMetadataFromHalV7( - sourceMetadata, true /*ignoreNonVendorTags*/, &hidlMetadata); - status != OK) { - return status; - } + RETURN_STATUS_IF_ERROR(CoreUtils::sourceMetadataFromHalV7( + sourceMetadata, true /*ignoreNonVendorTags*/, &hidlMetadata + )); #if !(MAJOR_VERSION == 7 && MINOR_VERSION == 1) //TODO: b/193496180 use spatializer flag at audio HAL when available