Merge pull request #1162 from VVeremjova/fix/FixActivateAfterDeactivate_App

Fix activation after DEACTIVATE_HMI 

2 files changed, 44 insertions, 28 deletions

diff --git a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc
index be3cd6314c..3734f73e0d 100644
--- a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc
@@ -65,9 +65,10 @@ void RequestFromHMI::SendResponse(
     const uint32_t correlation_id,
     const hmi_apis::FunctionID::eType function_id,
     const hmi_apis::Common_Result::eType result_code) {
-  smart_objects::SmartObject* message =
-      new smart_objects::SmartObject(smart_objects::SmartType_Map);
-  FillCommonParametersOfSO(message, correlation_id, function_id);
+  smart_objects::SmartObjectSPtr message =
+      ::utils::MakeShared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Map);
+  FillCommonParametersOfSO(*message, correlation_id, function_id);
   (*message)[strings::params][strings::message_type] = MessageType::kResponse;
   (*message)[strings::params][hmi_response::code] = 0;
   (*message)[strings::msg_params][strings::success] = success;
@@ -76,30 +77,32 @@ void RequestFromHMI::SendResponse(
   application_manager_.ManageHMICommand(message);
 }
 
-// void RequestFromHMI::SendErrorResponse(uint32_t correlation_id,
-//                                       hmi_apis::FunctionID::eType
-//                                       function_id,
-//                                       hmi_apis::Common_Result::eType
-//                                       result_code) {
-//  smart_objects::SmartObject* message = new smart_objects::SmartObject(
-//      smart_objects::SmartType_Map);
-//  FillCommonParametersOfSO(message, correlation_id, function_id);
-//  (*message)[strings::params][strings::message_type] =
-//  MessageType::kErrorResponse;
-//  (*message)[strings::params][hmi_response::code] = result_code;
-//  (*message)[strings::params][strings::error_msg] = "HMIDeactivate is active";
-
-//  application_manager_.ManageHMICommand(message);
-//}
+void RequestFromHMI::SendErrorResponse(
+    const uint32_t correlation_id,
+    const hmi_apis::FunctionID::eType function_id,
+    const hmi_apis::Common_Result::eType result_code,
+    const std::string error_message) {
+  smart_objects::SmartObjectSPtr message =
+      ::utils::MakeShared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Map);
+  FillCommonParametersOfSO(*message, correlation_id, function_id);
+  (*message)[strings::params][strings::message_type] =
+      MessageType::kErrorResponse;
+  (*message)[strings::params][hmi_response::code] = result_code;
+
+  (*message)[strings::params][strings::error_msg] = error_message;
+
+  application_manager_.ManageHMICommand(message);
+}
 
 void RequestFromHMI::FillCommonParametersOfSO(
-    smart_objects::SmartObject* message,
-    uint32_t correlation_id,
-    hmi_apis::FunctionID::eType function_id) {
-  (*message)[strings::params][strings::function_id] = function_id;
-  (*message)[strings::params][strings::protocol_type] = hmi_protocol_type_;
-  (*message)[strings::params][strings::protocol_version] = protocol_version_;
-  (*message)[strings::params][strings::correlation_id] = correlation_id;
+    smart_objects::SmartObject& message,
+    const uint32_t correlation_id,
+    const hmi_apis::FunctionID::eType function_id) {
+  (message)[strings::params][strings::function_id] = function_id;
+  (message)[strings::params][strings::protocol_type] = hmi_protocol_type_;
+  (message)[strings::params][strings::protocol_version] = protocol_version_;
+  (message)[strings::params][strings::correlation_id] = correlation_id;
 }
 
 }  // namespace commands
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 30ea41e0b0..4a501b5449 100644
--- 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
@@ -118,6 +118,18 @@ void SDLActivateAppRequest::Run() {
                 "Found application to activate. Application id is "
                     << app_to_activate->app_id());
 
+  if (application_manager_.state_controller().IsStateActive(
+          HmiState::StateID::STATE_ID_DEACTIVATE_HMI)) {
+    LOG4CXX_WARN(logger_,
+                 "DeactivateHmi state is active. "
+                 "Sends response with result code REJECTED");
+    SendErrorResponse(correlation_id(),
+                      static_cast<hmi_apis::FunctionID::eType>(function_id()),
+                      hmi_apis::Common_Result::REJECTED,
+                      "HMIDeactivate is active");
+    return;
+  }
+
   if (app_to_activate->IsRegistered()) {
     LOG4CXX_DEBUG(logger_, "Application is registered. Activating.");
     application_manager_.GetPolicyHandler().OnActivateApp(application_id,
@@ -134,7 +146,8 @@ void SDLActivateAppRequest::Run() {
                   "Can't find regular foreground app with the same "
                   "connection id:"
                       << device_handle);
-    SendResponse(false, correlation_id(), SDL_ActivateApp, NO_APPS_REGISTERED);
+    SendErrorResponse(
+        correlation_id(), SDL_ActivateApp, NO_APPS_REGISTERED, "");
     return;
   }
 
@@ -165,8 +178,8 @@ void SDLActivateAppRequest::onTimeOut() {
   using namespace hmi_apis::Common_Result;
   using namespace application_manager;
   unsubscribe_from_event(BasicCommunication_OnAppRegistered);
-  SendResponse(
-      false, correlation_id(), SDL_ActivateApp, APPLICATION_NOT_REGISTERED);
+  SendErrorResponse(
+      correlation_id(), SDL_ActivateApp, APPLICATION_NOT_REGISTERED, "");
 }
 
 void SDLActivateAppRequest::on_event(const event_engine::Event& event) {