From 0f17ab7f9fac4327a8772e9199f411af7df912a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Gaffie?= Date: Wed, 13 May 2015 18:13:00 +0200 Subject: Bug fix on Engine Configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes a couple of issue within audio policy engine configurable -valgrind error detected within the parsing of the configuration file -configuration file typos -start of the PFW delayed to the init in order to wait the full construction of the engine object -wrong specialization of template functions. -broadcast volume min / max init to stream collection of manager & PFW Change-Id: I08823ab4040c92b719747c60cc3fa5c8b5f172ac Signed-off-by: François Gaffie --- .../parameter-framework/plugin/PolicySubsystem.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'services/audiopolicy/engineconfigurable/parameter-framework') diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp index a5dab36..bf3906d 100755 --- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp +++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp @@ -49,17 +49,11 @@ PolicySubsystem::PolicySubsystem(const std::string &name) // Try to connect a Plugin Interface from Audio Policy Engine EngineInstance *engineInstance = EngineInstance::getInstance(); - if (engineInstance == NULL) { - ALOG_ASSERT(engineInstance != NULL, "NULL Plugin Interface"); - return; - } + ALOG_ASSERT(engineInstance != NULL, "NULL Plugin Interface"); + // Retrieve the Route Interface mPluginInterface = engineInstance->queryInterface(); - if (mPluginInterface == NULL) { - // bailing out - ALOG_ASSERT(mPluginInterface != NULL, "NULL Plugin Interface"); - return; - } + ALOG_ASSERT(mPluginInterface != NULL, "NULL Plugin Interface"); // Provide mapping keys to the core, necessary when parsing the XML Structure files. addContextMappingKey(mKeyName); -- cgit v1.1