diff options
author | Shunkai Yao <yaoshunkai@google.com> | 2023-03-06 18:41:27 +0000 |
---|---|---|
committer | Shunkai Yao <yaoshunkai@google.com> | 2023-03-20 01:48:10 +0000 |
commit | 4b3434f96efab51e863e9133336a49f30a859575 (patch) | |
tree | d996a124e41c2053705e39d43bdeee368b4793dd /audio/aidl/vts/VtsHalEqualizerTargetTest.cpp | |
parent | 2da977681b96a0b64924bc010bc1fc26981221c8 (diff) |
Update EffectUUID initialization
Avoid dynamic initialization global UUID variables
Bug: 271500140
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I7574c1fe1ba0aaff1d9d29a9eed10de1aef33806
Diffstat (limited to 'audio/aidl/vts/VtsHalEqualizerTargetTest.cpp')
-rw-r--r-- | audio/aidl/vts/VtsHalEqualizerTargetTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp index 9beb0a7210..716a2c67b5 100644 --- a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp @@ -37,15 +37,14 @@ #include "AudioHalBinderServiceUtil.h" #include "EffectHelper.h" #include "TestUtils.h" -#include "effect-impl/EffectUUID.h" using namespace android; using aidl::android::hardware::audio::effect::Descriptor; using aidl::android::hardware::audio::effect::Equalizer; +using aidl::android::hardware::audio::effect::getEffectTypeUuidEqualizer; using aidl::android::hardware::audio::effect::IEffect; using aidl::android::hardware::audio::effect::IFactory; -using aidl::android::hardware::audio::effect::kEqualizerTypeUUID; using aidl::android::hardware::audio::effect::Parameter; /** @@ -195,7 +194,7 @@ INSTANTIATE_TEST_SUITE_P( EqualizerTest, EqualizerTest, ::testing::Combine( testing::ValuesIn(kDescPair = EffectFactoryHelper::getAllEffectDescriptors( - IFactory::descriptor, kEqualizerTypeUUID)), + IFactory::descriptor, getEffectTypeUuidEqualizer())), testing::ValuesIn(EffectHelper::getTestValueSet<Equalizer, int, Range::equalizer, Equalizer::preset>( kDescPair, EffectHelper::expandTestValueBasic<int>)), |