Add to IVI plugin functionality to clear all application data.

5 files changed, 16 insertions, 3 deletions

diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index a18073cba3..dfc1e2a240 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -836,7 +836,6 @@ class MessageHelper {
       hmi_apis::Common_HMILevel::eType level = hmi_apis::Common_HMILevel::FULL,
       bool send_policy_priority = true);
 
- private:
   /**
    * @brief CreateMessageForHMI Creates HMI message with prepared header
    * acccoring to message type
@@ -847,6 +846,7 @@ class MessageHelper {
   static smart_objects::SmartObjectSPtr CreateMessageForHMI(
       hmi_apis::messageType::eType message_type, const uint32_t correlation_id);
 
+ private:
   /**
    * @brief Allows to fill SO according to the  current permissions.
    * @param permissions application permissions.
diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
index ecc6b2c265..c9a34a75d6 100644
--- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
+++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
@@ -56,7 +56,8 @@ enum PolicyEvent { kApplicationPolicyUpdated = 0, kApplicationsDisabled };
 enum ApplicationEvent {
   kApplicationExit = 0,
   kApplicationRegistered,
-  kApplicationUnregistered
+  kApplicationUnregistered,
+  kDeleteApplicationData
 };
 
 class RPCPlugin {
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
index 2e4978a40e..1cf7378594 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
@@ -65,10 +65,13 @@ class VehicleInfoPlugin : public plugins::RPCPlugin {
   void ProcessResumptionSubscription(app_mngr::ApplicationSharedPtr app,
                                      VehicleInfoAppExtension& ext);
 
+  static const VehicleData vehicle_data_;
+
  private:
+  void DeleteSubscriptions(app_mngr::ApplicationSharedPtr app);
+
   std::unique_ptr<app_mngr::CommandFactory> command_factory_;
   app_mngr::ApplicationManager* application_manager_;
-  static const VehicleData vehicle_data_;
 };
 }
 
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index e8a969718d..93b67016b3 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -119,6 +119,9 @@ class MockMessageHelper {
                     ApplicationManager& application_manager,
                     hmi_apis::Common_HMILevel::eType level,
                     bool send_policy_priority));
+  MOCK_METHOD2(CreateMessageForHMI,
+               smart_objects::SmartObjectSPtr(hmi_apis::messageType::eType,
+                                              const uint32_t));
   MOCK_METHOD2(SendHMIStatusNotification,
                void(const Application& application_impl,
                     ApplicationManager& application_manager));
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index 57a35e5283..998023e0c7 100644
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -239,6 +239,12 @@ void MessageHelper::SendActivateAppToHMI(
       app_id, application_manager, level, send_policy_priority);
 }
 
+smart_objects::SmartObjectSPtr MessageHelper::CreateMessageForHMI(
+    hmi_apis::messageType::eType message_type, const uint32_t correlation_id) {
+  return MockMessageHelper::message_helper_mock()->CreateMessageForHMI(
+      message_type, correlation_id);
+}
+
 void MessageHelper::SendHMIStatusNotification(
     const Application& application_impl,
     ApplicationManager& application_manager) {