From a8da86e4032f36803af3bb1df08c0c995ece38e9 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Mon, 12 Mar 2018 15:56:51 -0700 Subject: [PATCH] Audio V4: do not override V4 audo policy config XSD The xsd did not have its version in its name, thus the V4 and V2 were overwriting each other. Bug: 38184704 Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV4_0Target Change-Id: Id7e733729a9afcdcc582f88a5527b6eb1c7283bf Signed-off-by: Kevin Rocard --- audio/core/4.0/vts/functional/ValidateAudioConfiguration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/core/4.0/vts/functional/ValidateAudioConfiguration.cpp b/audio/core/4.0/vts/functional/ValidateAudioConfiguration.cpp index bef0e8276c..a64513fc81 100644 --- a/audio/core/4.0/vts/functional/ValidateAudioConfiguration.cpp +++ b/audio/core/4.0/vts/functional/ValidateAudioConfiguration.cpp @@ -26,5 +26,5 @@ TEST(CheckConfig, audioPolicyConfigurationValidation) { std::vector locations = {"/odm/etc", "/vendor/etc", "/system/etc"}; EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS("audio_policy_configuration.xml", locations, - "/data/local/tmp/audio_policy_configuration.xsd"); + "/data/local/tmp/audio_policy_configuration_V4_0.xsd"); }