summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2016-09-23 15:52:43 -0400
committerJackLivio <jack@livio.io>2016-09-23 15:52:43 -0400
commitc9d58468753bc8cf1ebe614298c9934c5abc536b (patch)
tree23905c6ad76f1a26aff98be048db74a8fac39855
parentcafed909b10654e34d0908019f05a92166846ec2 (diff)
downloadsdl_core-hotfix/activate_app_hangs_with_policies_disabled.tar.gz
POLICY_LIB_CHECK_VOID() crashes the policy handler thread when policies are disabled.
-rw-r--r--src/components/application_manager/src/policies/policy_handler.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index cf312acc6d..c317b4f945 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -959,7 +959,9 @@ void PolicyHandler::OnIgnitionCycleOver() {
void PolicyHandler::OnActivateApp(uint32_t connection_key,
uint32_t correlation_id) {
LOG4CXX_AUTO_TRACE(logger_);
- POLICY_LIB_CHECK_VOID();
+ if(PolicyEnabled()) {
+ POLICY_LIB_CHECK_VOID();
+ }
ApplicationSharedPtr app = application_manager_.application(connection_key);
if (!app.valid()) {
LOG4CXX_WARN(logger_, "Activated App failed: no app found.");