summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy/engineconfigurable/parameter-framework
diff options
context:
space:
mode:
authorFrançois Gaffie <francois.gaffie@intel.com>2015-05-13 18:13:00 +0200
committerEric Laurent <elaurent@google.com>2015-06-18 10:55:05 -0700
commit0f17ab7f9fac4327a8772e9199f411af7df912a4 (patch)
tree05d9dcb97a6f76ce0c0a43520d81705eb3241c27 /services/audiopolicy/engineconfigurable/parameter-framework
parent20f06f996337c9bf79d0b112083f6427a122ebab (diff)
downloadframeworks_av-0f17ab7f9fac4327a8772e9199f411af7df912a4.zip
frameworks_av-0f17ab7f9fac4327a8772e9199f411af7df912a4.tar.gz
frameworks_av-0f17ab7f9fac4327a8772e9199f411af7df912a4.tar.bz2
Bug fix on Engine Configurable
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 <francois.gaffie@intel.com>
Diffstat (limited to 'services/audiopolicy/engineconfigurable/parameter-framework')
-rwxr-xr-xservices/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp12
1 files changed, 3 insertions, 9 deletions
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<android::AudioPolicyPluginInterface>();
- 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);