commit 19418e32eda74149b5e2905d82eb271db6e75f73
author Mikhail Naganov <mnaganov@google.com> Fri Mar 10 17:55:14 2023 -0800
committer Mikhail Naganov <mnaganov@google.com> Mon Mar 13 12:46:42 2023 -0700
tree 75078b2f0f4a3e1ee08b1c7f4b283c047f4aa333
parent 59a368a4f44a03c58b8bb3231455a183f9be631b

Declare `ConversionResult` in `android` namespace

Previously the declaration was depending on the `BACKEND_NDK`
define, and `ConversionResult` could end up in the `aidl` NS
(::aidl::ConversionResult). Having it in `android` is more
convenient as it works for nested namespaces of `android`, for
example `android::effect`.

Added alias `aidl::android::ConversionResult` for the NDK
backend case.

Bug: 205884982
Test: m
Change-Id: Ic3238144d35afb86db57d5d620f2f28ccd89021e
Merged-In: Ic3238144d35afb86db57d5d620f2f28ccd89021e

media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp

diff --git a/media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp b/media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp
index d8fea47..9fb1c42 100644
--- a/media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp
+++ b/media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp
@@ -221,7 +221,7 @@
     }
 }
 
-aidl::ConversionResult<DynamicsProcessing::ChannelConfig>
+ConversionResult<DynamicsProcessing::ChannelConfig>
 AidlConversionDp::readChannelConfigFromParam(EffectParamReader& param) {
     int32_t enable, channel;
     RETURN_IF_ERROR(param.readFromParameter(&channel));
@@ -231,7 +231,7 @@
             {.enable = VALUE_OR_RETURN(convertIntegral<bool>(enable)), .channel = channel});
 }
 
-aidl::ConversionResult<DynamicsProcessing::EqBandConfig>
+ConversionResult<DynamicsProcessing::EqBandConfig>
 AidlConversionDp::readEqBandConfigFromParam(EffectParamReader& param) {
     DynamicsProcessing::EqBandConfig config;
     int32_t enable;
@@ -245,7 +245,7 @@
     return config;
 }
 
-aidl::ConversionResult<DynamicsProcessing::MbcBandConfig>
+ConversionResult<DynamicsProcessing::MbcBandConfig>
 AidlConversionDp::readMbcBandConfigFromParam(EffectParamReader& param) {
     DynamicsProcessing::MbcBandConfig config;
     int32_t enable;
@@ -267,7 +267,7 @@
     return config;
 }
 
-aidl::ConversionResult<DynamicsProcessing::LimiterConfig>
+ConversionResult<DynamicsProcessing::LimiterConfig>
 AidlConversionDp::readLimiterConfigFromParam(EffectParamReader& param) {
     DynamicsProcessing::LimiterConfig config;
     int32_t enable, inUse;
@@ -285,7 +285,7 @@
     return config;
 }
 
-aidl::ConversionResult<DynamicsProcessing::EngineArchitecture>
+ConversionResult<DynamicsProcessing::EngineArchitecture>
 AidlConversionDp::readEngineArchitectureFromParam(EffectParamReader& param) {
     DynamicsProcessing::EngineArchitecture engine;
     int32_t variant, preEqInUse, mbcInUse, postEqInUse, limiterInUse;