application manager merge

Signed-off-by: Justin Dickow <jjdickow@gmail.com>

diff --git a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
index ef308ad..3bd41c3 100644 (file)
--- a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
@@ -38,6 +38,10 @@
 #include "application_manager/commands/command_request_impl.h"
 #include "utils/macro.h"
 
+namespace policy {
+struct DeviceInfo;
+}
+
 namespace application_manager {
 
 class Application;
@@ -162,6 +166,12 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl {
    */
   mobile_apis::Result::eType CheckWithPolicyData();
 
+  /**
+   * @brief Fill DeviceInfo struct with data from request, if any
+   * @param device_info Struct for device params from request
+   */
+  void FillDeviceInfo(policy::DeviceInfo* device_info);
+
   std::string response_info_;
 
   DISALLOW_COPY_AND_ASSIGN(RegisterAppInterfaceRequest);

diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index 07fef5e..bc875f9 100644 (file)
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -229,9 +229,9 @@ class PolicyHandler : public utils::Singleton<PolicyHandler>,
    */
   void PTExchangeAtOdometer(int kilometers);
 
-    /**
+  /**
      * Starts proccess updating policy table
-     */
+   */
     void StartPTExchange(bool skip_device_selection = false);
 
  private:

diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
index fd98eb2..72abf23 100644 (file)
--- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
@@ -47,7 +47,7 @@ SDLActivateAppRequest::~SDLActivateAppRequest() {
 void SDLActivateAppRequest::Run() {
   LOG4CXX_INFO(logger_, "SDLActivateAppRequest::Run");
   policy::PolicyHandler::instance()->OnActivateApp(
-      (*message_)[strings::msg_params][strings::app_id].asString(),
+      (*message_)[strings::msg_params][strings::app_id].asUInt(),
       (*message_)[strings::params][strings::correlation_id].asInt());
 }
 

diff --git a/src/components/policy b/src/components/policy
index 7cefabb..3757b17 160000 (submodule)
--- a/src/components/policy
+++ b/src/components/policy
@@ -1 +1 @@
-Subproject commit 7cefabbf8a8757062cbf73b70d057a98b1fefb68
+Subproject commit 3757b175faea7fb7cb7cb3f6e4c398d8c3ec755c