Fixed resend keepContext parameter in GetInteriorVehicleData response

2 files changed, 24 insertions, 0 deletions

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc
index f12512a38d..ab9fe0cc89 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
 #include "application_manager/event_engine/event.h"
 
 namespace rc_rpc_plugin {
@@ -56,6 +57,17 @@ void RCGetInteriorVehicleDataResponse::Run() {
 
   app_mngr::event_engine::Event event(
       hmi_apis::FunctionID::RC_GetInteriorVehicleData);
+
+  smart_objects::SmartObject& module_data = (*message_)
+      [application_manager::strings::msg_params][message_params::kModuleData];
+  if (module_data.keyExists(message_params::kAudioControlData)) {
+    smart_objects::SmartObject& audio_control_data =
+        module_data[message_params::kAudioControlData];
+    if (audio_control_data.keyExists(message_params::kKeepContext)) {
+      audio_control_data.erase(message_params::kKeepContext);
+    }
+  }
+
   event.set_smart_object(*message_);
   event.raise(application_manager_.event_dispatcher());
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc
index 487193bc4d..3f757fab2e 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc
@@ -30,6 +30,7 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h"
 #include "utils/macro.h"
 
@@ -57,6 +58,17 @@ void RCOnInteriorVehicleDataNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[app_mngr::strings::params][app_mngr::strings::function_id] =
       static_cast<int>(mobile_apis::FunctionID::eType::OnInteriorVehicleDataID);
+
+  smart_objects::SmartObject& module_data = (*message_)
+      [application_manager::strings::msg_params][message_params::kModuleData];
+  if (module_data.keyExists(rc_rpc_plugin::message_params::kAudioControlData)) {
+    smart_objects::SmartObject& audio_control_data =
+        module_data[message_params::kAudioControlData];
+    if (audio_control_data.keyExists(message_params::kKeepContext)) {
+      audio_control_data.erase(message_params::kKeepContext);
+    }
+  }
+
   SendNotificationToMobile(message_);
 }