Merge pull request #404 from smartdevicelink/hotfix/fix_pt_sendMessagetoSDK4.0.5

Fix for sending policy table snapshot (Genivi implementation)

2 files changed, 3 insertions, 6 deletions

diff --git a/src/components/application_manager/src/message_helper.cc b/src/components/application_manager/src/message_helper.cc
index bbe5bad19b..adb4f94457 100644
--- a/src/components/application_manager/src/message_helper.cc
+++ b/src/components/application_manager/src/message_helper.cc
@@ -1934,7 +1934,7 @@ void MessageHelper::SendPolicySnapshotNotification(
 
   SmartObject content (SmartType_Map);
   if (!url.empty()) {
-    content[strings::msg_params][mobile_notification::syncp_url] = url;
+    content[strings::msg_params][strings::url] = url;
   }
 
   content[strings::msg_params][strings::request_type] = RequestType::HTTP;
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 6497ebf2ee..31d8099433 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -730,11 +730,8 @@ bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,
   LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK(false);
 
-  if (last_used_app_ids_.empty()) {
-    LOG4CXX_WARN(logger_, "last_used_app_ids_ is empty");
-    return false;
-  }
-  uint32_t app_id = last_used_app_ids_.back();
+
+  uint32_t app_id = GetAppIdForSending();
 
   ApplicationSharedPtr app =
     ApplicationManagerImpl::instance()->application(app_id);