Fixes after rebase

12 files changed, 50 insertions, 53 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h b/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
index 6abd3d23c0..c1e0205e68 100644
--- a/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
@@ -37,24 +37,23 @@
 #include "interfaces/HMI_API.h"
 #include "smart_objects/smart_object.h"
 
-namespace sdl_rpc_plugin {
-namespace app_mngr = application_manager;
+namespace application_manager {
 
 namespace commands {
 
-class NotificationFromHMI : public app_mngr::commands::CommandImpl {
+class NotificationFromHMI : public CommandImpl {
  public:
-  NotificationFromHMI(const app_mngr::commands::MessageSharedPtr& message,
-                      app_mngr::ApplicationManager& application_manager,
-                      application_manager::rpc_service::RPCService& rpc_service,
-                      application_manager::HMICapabilities& hmi_capabilities,
+  NotificationFromHMI(const MessageSharedPtr& message,
+                      ApplicationManager& application_manager,
+                      rpc_service::RPCService& rpc_service,
+                      HMICapabilities& hmi_capabilities,
                       policy::PolicyHandlerInterface& policy_handle);
   virtual ~NotificationFromHMI();
   virtual bool Init();
   virtual bool CleanUp();
   virtual void Run();
   void SendNotificationToMobile(
-      const app_mngr::commands::MessageSharedPtr& message);
+      const MessageSharedPtr& message);
   void CreateHMIRequest(const hmi_apis::FunctionID::eType& function_id,
                         const smart_objects::SmartObject& msg_params) const;
 
diff --git a/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h b/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h
index 7299a1a79c..5461ec1e34 100644
--- a/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h
@@ -35,17 +35,16 @@
 
 #include "application_manager/commands/command_impl.h"
 
-namespace sdl_rpc_plugin {
-namespace app_mngr = application_manager;
+namespace application_manager {
 
 namespace commands {
 
-class NotificationToHMI : public app_mngr::commands::CommandImpl {
+class NotificationToHMI : public CommandImpl {
  public:
-  NotificationToHMI(const app_mngr::commands::MessageSharedPtr& message,
-                    app_mngr::ApplicationManager& application_manager,
-                    app_mngr::rpc_service::RPCService& rpc_service,
-                    app_mngr::HMICapabilities& hmi_capabilities,
+  NotificationToHMI(const MessageSharedPtr& message,
+                    ApplicationManager& application_manager,
+                    rpc_service::RPCService& rpc_service,
+                    HMICapabilities& hmi_capabilities,
                     policy::PolicyHandlerInterface& policy_handle);
   virtual ~NotificationToHMI();
   virtual bool Init();
diff --git a/src/components/application_manager/include/application_manager/commands/response_from_hmi.h b/src/components/application_manager/include/application_manager/commands/response_from_hmi.h
index 174d08f216..7621e12edb 100644
--- a/src/components/application_manager/include/application_manager/commands/response_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/response_from_hmi.h
@@ -37,24 +37,23 @@
 #include "application_manager/application_manager.h"
 #include "interfaces/HMI_API.h"
 
-namespace sdl_rpc_plugin {
-namespace app_mngr = application_manager;
+namespace application_manager {
 
 namespace commands {
 
-class ResponseFromHMI : public app_mngr::commands::CommandImpl {
+class ResponseFromHMI : public CommandImpl {
  public:
-  ResponseFromHMI(const app_mngr::commands::MessageSharedPtr& message,
-                  app_mngr::ApplicationManager& application_manager,
-                  app_mngr::rpc_service::RPCService& rpc_service,
-                  app_mngr::HMICapabilities& hmi_capabilities,
+  ResponseFromHMI(const MessageSharedPtr& message,
+                  ApplicationManager& application_manager,
+                  rpc_service::RPCService& rpc_service,
+                  HMICapabilities& hmi_capabilities,
                   policy::PolicyHandlerInterface& policy_handle);
   virtual ~ResponseFromHMI();
   virtual bool Init();
   virtual bool CleanUp();
   virtual void Run();
-  void SendResponseToMobile(const app_mngr::commands::MessageSharedPtr& message,
-                            app_mngr::ApplicationManager& application_manager);
+  void SendResponseToMobile(const MessageSharedPtr& message,
+                            ApplicationManager& application_manager);
 
   /*
    * @brief Creates HMI request
diff --git a/src/components/application_manager/include/application_manager/commands/response_to_hmi.h b/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
index cdf06b22f4..4d10e8477e 100644
--- a/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
@@ -38,19 +38,18 @@
 #include "interfaces/HMI_API.h"
 #include "smart_objects/smart_object.h"
 
-namespace sdl_rpc_plugin {
-namespace app_mngr = application_manager;
+namespace application_manager {
 
 namespace commands {
 
 namespace NsSmart = NsSmartDeviceLink::NsSmartObjects;
 
-class ResponseToHMI : public app_mngr::commands::CommandImpl {
+class ResponseToHMI : public CommandImpl {
  public:
-  ResponseToHMI(const app_mngr::commands::MessageSharedPtr& message,
-                app_mngr::ApplicationManager& application_manager,
-                app_mngr::rpc_service::RPCService& rpc_service,
-                app_mngr::HMICapabilities& hmi_capabilities,
+  ResponseToHMI(const MessageSharedPtr& message,
+                ApplicationManager& application_manager,
+                rpc_service::RPCService& rpc_service,
+                HMICapabilities& hmi_capabilities,
                 policy::PolicyHandlerInterface& policy_handle);
   virtual ~ResponseToHMI();
   virtual bool Init();
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h
index a3e3559fb3..973143e751 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h
@@ -165,10 +165,6 @@ class PerformAudioPassThruRequest
    */
   bool IsWaitingHMIResponse();
 
-  /* flag display state of speak and ui perform audio
-  during perform audio pass thru*/
-  bool awaiting_tts_speak_response_;
-  bool awaiting_ui_response_;
   /**
    * @brief Pair of result_code and success for mobile app
    */
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
index 063a414df4..f95136f691 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
@@ -3,6 +3,9 @@
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
+ Copyright (c) 2017, Livio, Inc.
+ All rights reserved.
+
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
@@ -123,6 +126,14 @@ class SubscribeVehicleDataRequest
       app_mngr::ApplicationSharedPtr app,
       const smart_objects::SmartObject& msg_params) const;
 
+  DEPRECATED void CheckVISubscribtions(
+      app_mngr::ApplicationSharedPtr app,
+      std::string& out_info,
+      mobile_apis::Result::eType& out_result_code,
+      smart_objects::SmartObject& out_response_params,
+      smart_objects::SmartObject& out_request_params,
+      bool& out_result);
+
   /**
    * @brief Checks if current application and other applications
    * were subscribed to VI, prepare data that need to send to mobile app
@@ -136,7 +147,7 @@ class SubscribeVehicleDataRequest
    * HMI
    * @param result contains result that SDL sends to mobile app.
    */
-  void CheckVISubscribtions(app_mngr::ApplicationSharedPtr app,
+  void CheckVISubscriptions(app_mngr::ApplicationSharedPtr app,
                             std::string& out_info,
                             mobile_apis::Result::eType& out_result_code,
                             smart_objects::SmartObject& out_response_params,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc
index 7e81bf88a7..ff8fc46321 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc
@@ -56,7 +56,7 @@ using ::utils::SharedPtr;
 namespace am = ::application_manager;
 namespace strings = ::application_manager::strings;
 using sdl_rpc_plugin::commands::GetUrlsResponse;
-using sdl_rpc_plugin::commands::ResponseToHMI;
+using am::commands::ResponseToHMI;
 using am::commands::CommandImpl;
 
 typedef SharedPtr<ResponseToHMI> ResponseToHMIPtr;
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index d001b158de..f545927a31 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -973,10 +973,6 @@ void application_manager::ApplicationManagerImpl::MarkAppsGreyOut(
     }
   }
 }
-void ApplicationManagerImpl::OnErrorSending(
-    hmi_message_handler::MessageSharedPointer message) {
-  return;
-}
 
 void ApplicationManagerImpl::OnDeviceListUpdated(
     const connection_handler::DeviceMap& device_list) {
@@ -2831,8 +2827,8 @@ void ApplicationManagerImpl::ProcessPostponedMessages(const uint32_t app_id) {
         const mobile_apis::Result::eType check_result =
             CheckPolicyPermissions(app, function_id, params);
         if (mobile_api::Result::SUCCESS == check_result) {
-          ManageMobileCommand(message,
-                              commands::Command::CommandOrigin::ORIGIN_SDL);
+          rpc_service_->ManageMobileCommand(message,
+                              commands::Command::SOURCE_SDL);
         } else {
           app->PushMobileMessage(message);
         }
diff --git a/src/components/application_manager/src/commands/notification_from_hmi.cc b/src/components/application_manager/src/commands/notification_from_hmi.cc
index 481535d7aa..1fef383213 100644
--- a/src/components/application_manager/src/commands/notification_from_hmi.cc
+++ b/src/components/application_manager/src/commands/notification_from_hmi.cc
@@ -40,7 +40,7 @@ namespace application_manager {
 namespace commands {
 
 NotificationFromHMI::NotificationFromHMI(
-    const application_manager::commands::MessageSharedPtr& message,
+    const MessageSharedPtr& message,
     ApplicationManager& application_manager,
     rpc_service::RPCService& rpc_service,
     HMICapabilities& hmi_capabilities,
@@ -67,7 +67,7 @@ bool NotificationFromHMI::CleanUp() {
 void NotificationFromHMI::Run() {}
 
 void NotificationFromHMI::SendNotificationToMobile(
-    const application_manager::commands::MessageSharedPtr& message) {
+    const MessageSharedPtr& message) {
   (*message)[strings::params][strings::message_type] =
       static_cast<int32_t>(application_manager::MessageType::kNotification);
   rpc_service_.ManageMobileCommand(message, SOURCE_SDL);
diff --git a/src/components/application_manager/src/commands/notification_to_hmi.cc b/src/components/application_manager/src/commands/notification_to_hmi.cc
index 5e38207686..2e5f54e950 100644
--- a/src/components/application_manager/src/commands/notification_to_hmi.cc
+++ b/src/components/application_manager/src/commands/notification_to_hmi.cc
@@ -39,7 +39,7 @@ namespace application_manager {
 namespace commands {
 
 NotificationToHMI::NotificationToHMI(
-    const application_manager::commands::MessageSharedPtr& message,
+    const MessageSharedPtr& message,
     ApplicationManager& application_manager,
     rpc_service::RPCService& rpc_service,
     HMICapabilities& hmi_capabilities,
diff --git a/src/components/application_manager/src/commands/response_from_hmi.cc b/src/components/application_manager/src/commands/response_from_hmi.cc
index c158052b89..6e6761586b 100644
--- a/src/components/application_manager/src/commands/response_from_hmi.cc
+++ b/src/components/application_manager/src/commands/response_from_hmi.cc
@@ -34,13 +34,12 @@
 #include "application_manager/rpc_service.h"
 #include "smart_objects/smart_object.h"
 
-namespace sdl_rpc_plugin {
-using namespace application_manager;
+namespace application_manager {
 
 namespace commands {
 
 ResponseFromHMI::ResponseFromHMI(
-    const application_manager::commands::MessageSharedPtr& message,
+    const MessageSharedPtr& message,
     ApplicationManager& application_manager,
     rpc_service::RPCService& rpc_service,
     HMICapabilities& hmi_capabilities,
@@ -73,7 +72,7 @@ bool ResponseFromHMI::CleanUp() {
 void ResponseFromHMI::Run() {}
 
 void ResponseFromHMI::SendResponseToMobile(
-    const application_manager::commands::MessageSharedPtr& message,
+    const MessageSharedPtr& message,
     ApplicationManager& application_manager) {
   (*message)[strings::params][strings::message_type] = MessageType::kResponse;
 
diff --git a/src/components/application_manager/src/commands/response_to_hmi.cc b/src/components/application_manager/src/commands/response_to_hmi.cc
index 7aeddf28e5..7c297c56b0 100644
--- a/src/components/application_manager/src/commands/response_to_hmi.cc
+++ b/src/components/application_manager/src/commands/response_to_hmi.cc
@@ -34,13 +34,12 @@
 #include "application_manager/application_manager.h"
 #include "application_manager/rpc_service.h"
 
-namespace sdl_rpc_plugin {
-using namespace application_manager;
+namespace application_manager {
 
 namespace commands {
 
 ResponseToHMI::ResponseToHMI(
-    const application_manager::commands::MessageSharedPtr& message,
+    const MessageSharedPtr& message,
     ApplicationManager& application_manager,
     rpc_service::RPCService& rpc_service,
     HMICapabilities& hmi_capabilities,