From 4bb0606f3bede5abd33b28cd1d8f89d3a9b29ecd Mon Sep 17 00:00:00 2001 From: Shobhit Adlakha Date: Tue, 10 Mar 2020 13:39:08 -0400 Subject: Remove CanUpdate call in PolicyManagerImpl::StartPTExchange and restore CanUpdate behavior --- src/components/application_manager/src/policies/policy_handler.cc | 2 +- src/components/policy/policy_external/src/policy_manager_impl.cc | 2 +- src/components/policy/policy_regular/src/policy_manager_impl.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 490a27f71b..4bbb33b504 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -1953,7 +1953,7 @@ void PolicyHandler::OnPTUFinished(const bool ptu_result) { } bool PolicyHandler::CanUpdate() { - return true; + return 0 != GetAppIdForSending(); } void PolicyHandler::RemoveDevice(const std::string& device_id) { diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index 5c1d8b0b01..41ebbca759 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -755,7 +755,7 @@ void PolicyManagerImpl::StartPTExchange() { return; } LOG4CXX_INFO(logger_, "Policy want to call RequestPTUpdate"); - if (listener_ && listener_->CanUpdate()) { + if (listener_) { LOG4CXX_INFO(logger_, "Listener CanUpdate"); if (update_status_manager_.IsUpdateRequired()) { update_status_manager_.PendingUpdate(); diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc index 8ea461ac41..6f646af8df 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -662,7 +662,7 @@ void PolicyManagerImpl::StartPTExchange() { return; } - if (listener_ && listener_->CanUpdate()) { + if (listener_) { if (ignition_check) { CheckTriggers(); ignition_check = false; -- cgit v1.2.1