commit 5b54e5b25f4821c4f0078d8ab5264be837db028f
author Kevin Rocard <krocard@google.com> Fri Sep 08 22:15:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 08 22:15:44 2017 +0000
tree 4ffd70d51c62cd0dddde4dc8e38a89e147aaa8c9
parent 8809d4f0d6c7f7acc2b3ffcc46fba3d2b83bb7f8
parent 12c64f9ea2bfb2c8a99e4107355551b2ebed3efa

Audio VTS: remove expectation of policy configuration unicity am: 76efe01bbd am: 6b51d9a855
am: 12c64f9ea2

Change-Id: I864ec4f565fd440affc83738d3ccb0cc2221fb0b

audio/2.0/vts/functional/ValidateAudioConfiguration.cpp

diff --git a/audio/2.0/vts/functional/ValidateAudioConfiguration.cpp b/audio/2.0/vts/functional/ValidateAudioConfiguration.cpp
index 5fc1b3d..ee49023 100644
--- a/audio/2.0/vts/functional/ValidateAudioConfiguration.cpp
+++ b/audio/2.0/vts/functional/ValidateAudioConfiguration.cpp
@@ -24,13 +24,9 @@
     const char* possibleConfigLocations[] = {"/odm/etc", "/vendor/etc", "/system/etc"};
     const char* configSchemaPath = "/data/local/tmp/audio_policy_configuration.xsd";
 
-    bool found = false;
     for (std::string folder : possibleConfigLocations) {
         const auto configPath = folder + '/' + configName;
         if (access(configPath.c_str(), R_OK) == 0) {
-            ASSERT_FALSE(found) << "Multiple " << configName << " found in "
-                                << ::testing::PrintToString(possibleConfigLocations);
-            found = true;
             ASSERT_VALID_XML(configPath.c_str(), configSchemaPath);
         }
     }