APPLINK-3396

Core.PerformInteraction: when in VR, the PerformInteraction is triggered by the command (NOT by the interaction choice) which cmdID coincides with the ChoiceID.

diff --git a/src/components/application_manager/src/commands/mobile/add_command_request.cc b/src/components/application_manager/src/commands/mobile/add_command_request.cc
index 8d38b93..c05aed1 100644 (file)
--- a/src/components/application_manager/src/commands/mobile/add_command_request.cc
+++ b/src/components/application_manager/src/commands/mobile/add_command_request.cc
@@ -166,6 +166,8 @@ void AddCommandRequest::Run() {
         (*message_)[strings::msg_params][strings::vr_commands];
     vr_msg_params[strings::app_id] = app->app_id();
 
+    vr_msg_params[strings::type] = hmi_apis::Common_VRCommandType::Command;
+
     send_vr_ = true;
   }
 

diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
index e46161d..cfe0dc8 100644 (file)
--- a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
+++ b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
@@ -452,6 +452,8 @@ void PerformInteractionRequest::SendVRAddCommandRequest(
             smart_objects::SmartType_Array);
         msg_params[strings::vr_commands] =
             (*choice_set)[strings::choice_set][j][strings::vr_commands];
+
+        msg_params[strings::type] = hmi_apis::Common_VRCommandType::Choice;
         SendHMIRequest(hmi_apis::FunctionID::VR_AddCommand, &msg_params);
       }
     }

diff --git a/src/components/application_manager/src/message_helper.cc b/src/components/application_manager/src/message_helper.cc
index ee7417e..2b21950 100644 (file)
--- a/src/components/application_manager/src/message_helper.cc
+++ b/src/components/application_manager/src/message_helper.cc
@@ -852,6 +852,8 @@ smart_objects::SmartObject* MessageHelper::CreateAddVRCommandToHMI(uint32_t cmd_
   if (0 < app_id) {
     msg_params[strings::app_id] = app_id;
   }
+  msg_params[strings::type] = hmi_apis::Common_VRCommandType::Command;
+
   (*vr_command)[strings::msg_params] = msg_params;
 
   return vr_command;