Fix SDL sends multiple OnRCStatus notification in case of app unregistration

Fix disabling RC-functionality

2 files changed, 12 insertions, 3 deletions

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h
index 71ee5fddff..98da8bc27d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h
@@ -150,6 +150,10 @@ class ResourceAllocationManager {
    */
   virtual void SendOnRCStatusNotification() = 0;
 
+  virtual bool is_rc_enabled() const = 0;
+
+  virtual void set_rc_enabled(const bool value) = 0;
+
   virtual ~ResourceAllocationManager() {}
 };
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
index 434bde2a82..4c72e9ea2c 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
@@ -120,6 +120,10 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
 
   void SendOnRCStatusNotification() FINAL;
 
+  bool is_rc_enabled() const FINAL;
+
+  void set_rc_enabled(const bool value) FINAL;
+
  private:
   typedef std::vector<application_manager::ApplicationSharedPtr> Apps;
 
@@ -130,11 +134,10 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
    * @return smart object with mobile OnRCStatusNotification
    */
   smart_objects::SmartObjectSPtr CreateOnRCStatusNotificationToMobile(
-      const uint32_t app_id);
+      const application_manager::ApplicationSharedPtr app);
 
   smart_objects::SmartObjectSPtr CreateOnRCStatusNotificationToHmi(
-      const uint32_t app_id);
-
+      const application_manager::ApplicationSharedPtr app);
 
   /**
    * @brief IsModuleTypeRejected check if current resource was rejected by
@@ -194,6 +197,7 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
   void SetResourceFree(const std::string& module_type, const uint32_t app_id);
 
   std::vector<std::string> all_supported_modules();
+
   /**
    * @brief AllocatedResources contains link between resource and application
    * owning that resource
@@ -221,6 +225,7 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
   hmi_apis::Common_RCAccessMode::eType current_access_mode_;
   application_manager::ApplicationManager& app_mngr_;
   application_manager::rpc_service::RPCService& rpc_service_;
+  bool is_rc_enabled_;
 };
 }  // rc_rpc_plugin