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/AidlConversionEq.cpp

diff --git a/media/libaudiohal/impl/effectsAidlConversion/AidlConversionEq.cpp b/media/libaudiohal/impl/effectsAidlConversion/AidlConversionEq.cpp
index f1c2926..de47127 100644
--- a/media/libaudiohal/impl/effectsAidlConversion/AidlConversionEq.cpp
+++ b/media/libaudiohal/impl/effectsAidlConversion/AidlConversionEq.cpp
@@ -113,20 +113,20 @@
     return statusTFromBinderStatus(mEffect->setParameter(aidlParam));
 }
 
-aidl::ConversionResult<Parameter> AidlConversionEq::getAidlParameter(Equalizer::Tag tag) {
+ConversionResult<Parameter> AidlConversionEq::getAidlParameter(Equalizer::Tag tag) {
     Parameter aidlParam;
     Parameter::Id id = MAKE_SPECIFIC_PARAMETER_ID(Equalizer, equalizerTag, tag);
     RETURN_IF_ERROR(statusTFromBinderStatus(mEffect->getParameter(id, &aidlParam)));
     return aidlParam;
 }
 
-aidl::ConversionResult<int32_t> AidlConversionEq::getParameterPreset() {
+ConversionResult<int32_t> AidlConversionEq::getParameterPreset() {
     Parameter aidlParam = VALUE_OR_RETURN_STATUS(getAidlParameter(Equalizer::preset));
     return VALUE_OR_RETURN_STATUS(GET_PARAMETER_SPECIFIC_FIELD(aidlParam, Equalizer, equalizer,
                                                                Equalizer::preset, int32_t));
 }
 
-aidl::ConversionResult<std::string> AidlConversionEq::getParameterPresetName(
+ConversionResult<std::string> AidlConversionEq::getParameterPresetName(
         EffectParamWriter& param) {
     int32_t presetIdx;
     if (OK != param.readFromParameter(&presetIdx)) {