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