Merge branch 'feature/base_app_services_implementation' into feature/app_services_ini_behaviorfeature/app_services_ini_behavior

3 files changed, 19 insertions, 9 deletions

diff --git a/src/components/application_manager/include/application_manager/app_service_manager.h b/src/components/application_manager/include/application_manager/app_service_manager.h
index 9920b63bd7..5a345e60fb 100644
--- a/src/components/application_manager/include/application_manager/app_service_manager.h
+++ b/src/components/application_manager/include/application_manager/app_service_manager.h
@@ -98,14 +98,6 @@ class AppServiceManager {
   /**
    * @brief TODO
    * @param service_id
-   * @param service_published
-   */
-  void SetServicePublished(const std::string service_id,
-                           bool service_published);
-
-  /**
-   * @brief TODO
-   * @param service_id
    */
   bool SetDefaultService(const std::string service_id);
 
@@ -153,12 +145,25 @@ class AppServiceManager {
 
   std::string DefaultServiceByType(std::string service_type);
 
+  /**
+   * @brief TODO
+   * @param service_id
+   * @param service_published
+   */
+  void SetServicePublished(const std::string service_id,
+                           bool service_published);
+
+  /**
+   * @brief TODO
+   * @param out_params
+   */
+  bool UpdateNavigationCapabilities(smart_objects::SmartObject& out_params);
+
  private:
   ApplicationManager& app_manager_;
   resumption::LastState& last_state_;
   std::map<std::string, AppService> published_services_;
 
-  void BroadcastAppServiceUpdate(smart_objects::SmartObject& msg_params);
   void AppServiceUpdated(
       const smart_objects::SmartObject& service_record,
       const mobile_apis::ServiceUpdateReason::eType update_reason,
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 fd16d57740..8a8e50bf1c 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -881,6 +881,9 @@ class MessageHelper {
   static smart_objects::SmartObject CreateAppServiceCapabilities(
       std::vector<smart_objects::SmartObject>& all_services);
 
+  static void BroadcastCapabilityUpdate(smart_objects::SmartObject& msg_params,
+                                        ApplicationManager& app_mngr);
+
  private:
   /**
    * @brief Allows to fill SO according to the  current permissions.
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index 5bafdaf4d0..78f336fb64 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -394,6 +394,8 @@ extern const char* const keyboard_layout_supported;
 extern const char* const keypress_mode_supported;
 extern const char* const limited_characters_list_supported;
 extern const char* const auto_complete_text_supported;
+extern const char* const send_location_enabled;
+extern const char* const get_way_points_enabled;
 extern const char* const entity_type;
 extern const char* const entity_id;
 extern const char* const status;