diff --git a/audio/aidl/default/EffectFactory.cpp b/audio/aidl/default/EffectFactory.cpp index c1ac3f2d41..f0687cc80f 100644 --- a/audio/aidl/default/EffectFactory.cpp +++ b/audio/aidl/default/EffectFactory.cpp @@ -75,6 +75,8 @@ ndk::ScopedAStatus Factory::queryEffects(const std::optional& in_type RETURN_IF(!libInterface || !libInterface->queryEffectFunc, EX_NULL_POINTER, "dlNullQueryEffectFunc"); RETURN_IF_BINDER_EXCEPTION(libInterface->queryEffectFunc(&id.uuid, &desc)); + // update proxy UUID with information from config xml + desc.common.id.proxy = id.proxy; _aidl_return->emplace_back(std::move(desc)); } } diff --git a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp index df66bd3a6c..d8ad6c9982 100644 --- a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp @@ -139,7 +139,10 @@ TEST_P(AudioEffectTest, GetDescritorBeforeOpen) { Descriptor desc; ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor)); ASSERT_NO_FATAL_FAILURE(getDescriptor(mEffect, desc)); - EXPECT_EQ(mDescriptor.common, desc.common); + EXPECT_EQ(mDescriptor.common.id.type, desc.common.id.type); + EXPECT_EQ(mDescriptor.common.id.uuid, desc.common.id.uuid); + EXPECT_EQ(mDescriptor.common.name, desc.common.name); + EXPECT_EQ(mDescriptor.common.implementor, desc.common.implementor); // Effect implementation Must fill in implementor and name EXPECT_NE("", desc.common.name); EXPECT_NE("", desc.common.implementor); @@ -176,7 +179,11 @@ TEST_P(AudioEffectTest, DescriptorExistAndUnique) { ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor)); ASSERT_NO_FATAL_FAILURE(getDescriptor(mEffect, desc)); - EXPECT_EQ(1ul, idSet.count(desc.common.id)); + int uuidCount = std::count_if(idSet.begin(), idSet.end(), [&](const auto& id) { + return id.uuid == desc.common.id.uuid && id.type == desc.common.id.type; + }); + + EXPECT_EQ(1, uuidCount); ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect)); }