commit 6b51d9a855c2be4499de4bd340602eb1e0dbf879
author Kevin Rocard <krocard@google.com> Fri Sep 08 22:12:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 08 22:12:14 2017 +0000
tree 27cba5c46d05c6eaed5bf31f3d275080d46513be
parent 37b490df357435d0e212e94776f6d0ec0c83abde
parent 76efe01bbd841b4f4e8e57fa8a72a3e3af77a042

Audio VTS: remove expectation of policy configuration unicity
am: 76efe01bbd

Change-Id: I23948718eaed0a687cc7dbd6b4940fc8514fbe1b

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);
         }
     }