diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2020-04-14 14:53:22 -0700 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2020-04-15 10:09:38 -0700 |
| commit | 5a6ffb21a59d6575a359eb30f35855615839a9c2 (patch) | |
| tree | d90709ba3d45076f6618727ca0cc3257451bdd3d /audio/policy | |
| parent | 10256e3ad83809096e0608380154257138ce9d22 (diff) | |
| download | platform_hardware_interfaces-5a6ffb21a59d6575a359eb30f35855615839a9c2.tar.gz platform_hardware_interfaces-5a6ffb21a59d6575a359eb30f35855615839a9c2.tar.bz2 platform_hardware_interfaces-5a6ffb21a59d6575a359eb30f35855615839a9c2.zip | |
audio: Centralize audio configuration paths specification
The list of possible paths for the audio configuration
files is now retrieved using audio_get_configuration_paths()
function. All duplicated lists of known configuration
directories have been removed.
Bug: 153680356
Test: atest VtsHalAudioV5_0TargetTest \
VtsHalAudioPolicyV1_0TargetTest \
VtsHalAudioEffectV5_0TargetTest
Change-Id: I1e40fdf8d6e3a5ac339f7f138f62063bb87bd3da
Diffstat (limited to 'audio/policy')
| -rw-r--r-- | audio/policy/1.0/vts/functional/ValidateEngineConfiguration.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/audio/policy/1.0/vts/functional/ValidateEngineConfiguration.cpp b/audio/policy/1.0/vts/functional/ValidateEngineConfiguration.cpp index a0aaa6e89f..5741fa97cc 100644 --- a/audio/policy/1.0/vts/functional/ValidateEngineConfiguration.cpp +++ b/audio/policy/1.0/vts/functional/ValidateEngineConfiguration.cpp @@ -23,7 +23,8 @@ #include <string> #include "utility/ValidateXml.h" -static const std::vector<const char*> locations = {"/odm/etc", "/vendor/etc", "/system/etc"}; +#include <system/audio_config.h> + static const std::string config = "audio_policy_engine_configuration.xml"; static const std::string schema = std::string(XSD_DIR) + "/audio_policy_engine_configuration_V1_0.xsd"; @@ -42,7 +43,8 @@ TEST(ValidateConfiguration, audioPolicyEngineConfiguration) { RecordProperty("description", "Verify that the audio policy engine configuration file " "is valid according to the schemas"); - EXPECT_VALID_XML_MULTIPLE_LOCATIONS(config.c_str(), locations, schema.c_str()); + EXPECT_VALID_XML_MULTIPLE_LOCATIONS(config.c_str(), android::audio_get_configuration_paths(), + schema.c_str()); } /** @@ -52,9 +54,11 @@ TEST(ValidateConfiguration, audioPolicyEngineConfiguration) { */ static bool deviceUsesConfigurableEngine() { return android::hardware::audio::common::test::utility::validateXmlMultipleLocations<true>( - "", "", "", config.c_str(), locations, schema.c_str()) && + "", "", "", config.c_str(), android::audio_get_configuration_paths(), + schema.c_str()) && android::hardware::audio::common::test::utility::validateXmlMultipleLocations<true>( - "", "", "", configurableConfig.c_str(), locations, configurableSchemas.c_str()); + "", "", "", configurableConfig.c_str(), android::audio_get_configuration_paths(), + configurableSchemas.c_str()); } TEST(ValidateConfiguration, audioPolicyEngineConfigurable) { |