1 files changed, 23 insertions, 14 deletions

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
index 984d6ec9a0..fd6b4e86ac 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
@@ -34,10 +34,15 @@
 #include "rc_rpc_plugin/rc_command_factory.h"
 #include "rc_rpc_plugin/rc_app_extension.h"
 #include "rc_rpc_plugin/resource_allocation_manager_impl.h"
+#include "rc_rpc_plugin/interior_data_cache_impl.h"
+#include "rc_rpc_plugin/interior_data_manager_impl.h"
+#include "rc_rpc_plugin/rc_helpers.h"
 #include "utils/helpers.h"
 #include <memory>
 
 namespace rc_rpc_plugin {
+CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule");
+
 namespace plugins = application_manager::plugin_manager;
 
 bool RCRPCPlugin::Init(
@@ -45,14 +50,22 @@ bool RCRPCPlugin::Init(
     application_manager::rpc_service::RPCService& rpc_service,
     application_manager::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler) {
+  interior_data_cache_.reset(new InteriorDataCacheImpl());
+  interior_data_manager_.reset(new InteriorDataManagerImpl(
+      *this, *interior_data_cache_, app_manager, rpc_service));
+
   resource_allocation_manager_.reset(
       new ResourceAllocationManagerImpl(app_manager, rpc_service));
-  command_factory_.reset(
-      new rc_rpc_plugin::RCCommandFactory(app_manager,
-                                          rpc_service,
-                                          hmi_capabilities,
-                                          policy_handler,
-                                          *resource_allocation_manager_));
+  RCCommandParams params{app_manager,
+                         rpc_service,
+                         hmi_capabilities,
+                         policy_handler,
+                         *(resource_allocation_manager_.get()),
+                         *(interior_data_cache_.get()),
+                         *(interior_data_manager_.get())};
+  command_factory_.reset(new rc_rpc_plugin::RCCommandFactory(params));
+  rpc_service_ = &rpc_service;
+  app_mngr_ = &app_manager;
   return true;
 }
 
@@ -73,14 +86,8 @@ application_manager::CommandFactory& RCRPCPlugin::GetCommandFactory() {
 
 void RCRPCPlugin::OnPolicyEvent(
     application_manager::plugin_manager::PolicyEvent event) {
-  switch (event) {
-    case plugins::kApplicationPolicyUpdated: {
-      resource_allocation_manager_->OnPolicyEvent(event);
-      break;
-    }
-    default:
-      break;
-  }
+  resource_allocation_manager_->OnPolicyEvent(event);
+  interior_data_manager_->OnPolicyEvent(event);
 }
 
 void RCRPCPlugin::OnApplicationEvent(
@@ -99,10 +106,12 @@ void RCRPCPlugin::OnApplicationEvent(
     }
     case plugins::kApplicationExit: {
       resource_allocation_manager_->OnApplicationEvent(event, application);
+      interior_data_manager_->OnApplicationEvent(event, application);
       break;
     }
     case plugins::kApplicationUnregistered: {
       resource_allocation_manager_->OnApplicationEvent(event, application);
+      interior_data_manager_->OnApplicationEvent(event, application);
       break;
     }
     default: