Fix conflitcs

6 files changed, 27 insertions, 103 deletions

diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
index 6000177321..417135fcb6 100755
--- a/src/appMain/hmi_capabilities.json
+++ b/src/appMain/hmi_capabilities.json
@@ -324,39 +324,10 @@
                 "diagonalScreenSize": 8,
                 "pixelPerInch": 117,
                 "scale": 1
-<<<<<<< HEAD
-            },
-            "seatLocationCapability": {
-                "rows": 2,
-                "columns": 3,
-                "levels": 1,
-                "seats": [
-                    {
-                        "row": 0,
-                        "col": 0,
-                        "level": 0,
-                        "rowspan": 1,
-                        "levelspan": 1,
-                        "colspan": 1
-                    }
-                ]
             },
             "driverDistractionCapability": {
                 "menuLength": 10,
                 "subMenuDepth": 3
-            },
-            "remoteControlCapability": {
-                "buttonCapabilities": [
-                    {
-                        "longPressAvailable": true,
-                        "name": "AC_MAX",
-                        "moduleInfo": {
-                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
-                            "allowMultipleAccess": false
-                        },
-                        "shortPressAvailable": true,
-                        "upDownAvailable": false
-=======
             }
         }
     },
@@ -369,7 +340,6 @@
                     "moduleInfo": {
                         "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
                         "allowMultipleAccess": false
->>>>>>> origin/develop
                     },
                     "shortPressAvailable": true,
                     "upDownAvailable": false
diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
index 1d093c9b28..1e75499a07 100644
--- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
+++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
@@ -194,7 +194,6 @@ class HMICapabilitiesImpl : public HMICapabilities {
 
   bool rc_supported() const OVERRIDE;
 
-<<<<<<< HEAD
   /*
    * @brief Interface to store whether HMI supports driver distraction menu
    * limits
@@ -218,8 +217,6 @@ class HMICapabilitiesImpl : public HMICapabilities {
    * @param navigation_capability contains information related
    * to the navigation system capability.
    */
-=======
->>>>>>> origin/develop
   void set_navigation_capability(
       const smart_objects::SmartObject& navigation_capability) OVERRIDE;
 
@@ -244,7 +241,7 @@ class HMICapabilitiesImpl : public HMICapabilities {
   void set_driver_distraction_capability(
       const smart_objects::SmartObject& driver_distraction_capability) OVERRIDE;
 
-  const smart_objects::SmartObject* driver_distraction_capability()
+  const smart_objects::SmartObjectSPtr driver_distraction_capability()
       const OVERRIDE;
 
   void set_seat_location_capability(
@@ -478,20 +475,12 @@ class HMICapabilitiesImpl : public HMICapabilities {
   bool is_rc_supported_;
   bool is_driver_distraction_supported_;
   std::string ccpu_version_;
-<<<<<<< HEAD
-  smart_objects::SmartObject* navigation_capability_;
-  smart_objects::SmartObject* phone_capability_;
-  smart_objects::SmartObject* video_streaming_capability_;
-  smart_objects::SmartObject* rc_capability_;
-  smart_objects::SmartObject* driver_distraction_capability_;
-  smart_objects::SmartObject* seat_location_capability_;
-=======
   smart_objects::SmartObjectSPtr navigation_capability_;
   smart_objects::SmartObjectSPtr phone_capability_;
   smart_objects::SmartObjectSPtr video_streaming_capability_;
   smart_objects::SmartObjectSPtr rc_capability_;
+  smart_objects::SmartObjectSPtr driver_distraction_capability_;
   smart_objects::SmartObjectSPtr seat_location_capability_;
->>>>>>> origin/develop
 
   ApplicationManager& app_mngr_;
   HMILanguageHandler hmi_language_handler_;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
index 1b9ffb4ec2..9f45d174e7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
@@ -141,29 +141,19 @@ void UIGetCapabilitiesResponse::Run() {
       hmi_capabilities_.set_video_streaming_capability(
           system_capabilities_so[strings::video_streaming_capability]);
     }
-<<<<<<< HEAD
-    if (msg_params[strings::system_capabilities].keyExists(
+    if (system_capabilities_so.keyExists(
             strings::driver_distraction_capability)) {
-      if (!msg_params[strings::system_capabilities]
-                     [strings::driver_distraction_capability]
-                         .empty()) {
-        hmi_capabilities.set_driver_distraction_capability(
-            msg_params[strings::system_capabilities]
-                      [strings::driver_distraction_capability]);
-        hmi_capabilities.set_driver_distraction_supported(true);
+      if (!system_capabilities_so[strings::driver_distraction_capability]
+               .empty()) {
+        hmi_capabilities_.set_driver_distraction_capability(
+            system_capabilities_so[strings::driver_distraction_capability]);
+        hmi_capabilities_.set_driver_distraction_supported(true);
       }
     }
-    if (msg_params[strings::system_capabilities].keyExists(
-            strings::display_capabilities)) {
-      hmi_capabilities.set_system_display_capabilities(
-          msg_params[strings::system_capabilities]
-                    [strings::display_capabilities]);
-=======
     if (system_capabilities_so.keyExists(strings::display_capabilities)) {
       sections_to_update.push_back(strings::display_capabilities);
       hmi_capabilities_.set_system_display_capabilities(
           system_capabilities_so[strings::display_capabilities]);
->>>>>>> origin/develop
     }
   }
 
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index fc1991e852..c5ab78ade5 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -765,11 +765,9 @@ void HMICapabilitiesImpl::set_rc_capability(
 
 void HMICapabilitiesImpl::set_driver_distraction_capability(
     const smart_objects::SmartObject& driver_distraction_capability) {
-  if (driver_distraction_capability_) {
-    delete driver_distraction_capability_;
-  }
-  driver_distraction_capability_ =
-      new smart_objects::SmartObject(driver_distraction_capability);
+  auto new_value = std::make_shared<smart_objects::SmartObject>(
+      driver_distraction_capability);
+  driver_distraction_capability_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_seat_location_capability(
@@ -911,17 +909,12 @@ bool HMICapabilitiesImpl::rc_supported() const {
   return is_rc_supported_;
 }
 
-<<<<<<< HEAD
 bool HMICapabilitiesImpl::driver_distraction_supported() const {
   return is_driver_distraction_supported_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::navigation_capability()
-    const {
-=======
 const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::navigation_capability() const {
->>>>>>> origin/develop
   return navigation_capability_;
 }
 
@@ -940,16 +933,12 @@ const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::rc_capability()
   return rc_capability_;
 }
 
-<<<<<<< HEAD
-const smart_objects::SmartObject*
+const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::driver_distraction_capability() const {
   return driver_distraction_capability_;
 }
 
-const smart_objects::SmartObject*
-=======
 const smart_objects::SmartObjectSPtr
->>>>>>> origin/develop
 HMICapabilitiesImpl::seat_location_capability() const {
   return seat_location_capability_;
 }
@@ -1453,6 +1442,18 @@ bool HMICapabilitiesImpl::LoadCapabilitiesFromFile() {
             set_video_streaming_supported(true);
           }
         }
+        if (JsonIsMemberSafe(ui_system_capabilities_node,
+                             strings::driver_distraction_capability)) {
+          Json::Value dd_capability = ui_system_capabilities_node.get(
+              strings::driver_distraction_capability, "");
+          smart_objects::SmartObject dd_capability_so;
+          formatters::CFormatterJsonBase::jsonValueToObj(dd_capability,
+                                                         dd_capability_so);
+          set_driver_distraction_capability(dd_capability_so);
+          if (!dd_capability_so.empty()) {
+            set_driver_distraction_supported(true);
+          }
+        }
       }
     } else {
       AddRequiredRequestsForCapabilities(hmi_interface::ui);
@@ -1492,27 +1493,6 @@ bool HMICapabilitiesImpl::LoadCapabilitiesFromFile() {
           set_rc_supported(true);
           set_rc_capability(rc_capability_so);
         }
-<<<<<<< HEAD
-        if (check_existing_json_member(system_capabilities,
-                                       "driverDistractionCapability")) {
-          Json::Value driver_distraction_capability =
-              system_capabilities.get("driverDistractionCapability", "");
-          smart_objects::SmartObject driver_distraction_capability_so;
-          formatters::CFormatterJsonBase::jsonValueToObj(
-              driver_distraction_capability, driver_distraction_capability_so);
-          set_driver_distraction_capability(driver_distraction_capability_so);
-          if (!driver_distraction_capability_so.empty()) {
-            set_driver_distraction_supported(true);
-          }
-        }
-        if (check_existing_json_member(system_capabilities,
-                                       "seatLocationCapability")) {
-          Json::Value seat_location_capability =
-              system_capabilities.get("seatLocationCapability", "");
-          smart_objects::SmartObject seat_location_capability_so;
-          formatters::CFormatterJsonBase::jsonValueToObj(
-              seat_location_capability, seat_location_capability_so);
-=======
       }
 
       auto seat_location_capabilitiy_node =
@@ -1527,7 +1507,6 @@ bool HMICapabilitiesImpl::LoadCapabilitiesFromFile() {
 
         if (!seat_location_capability_so.empty()) {
           set_rc_supported(true);
->>>>>>> origin/develop
           set_seat_location_capability(seat_location_capability_so);
         }
       }
diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
index a698542f1c..2f9f40ad2a 100644
--- a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
+++ b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
@@ -194,7 +194,7 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities {
                void(const smart_objects::SmartObject& rc_capability));
 
   MOCK_CONST_METHOD0(driver_distraction_capability,
-                     const smart_objects::SmartObject*());
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(
       set_driver_distraction_capability,
       void(const smart_objects::SmartObject& driver_distraction_capability));
diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h
index 366fc17993..56ac807d63 100644
--- a/src/components/include/application_manager/hmi_capabilities.h
+++ b/src/components/include/application_manager/hmi_capabilities.h
@@ -408,7 +408,6 @@ class HMICapabilities {
    */
   virtual bool rc_supported() const = 0;
 
-<<<<<<< HEAD
   /*
    * @brief Interface to store whether HMI supports driver distraction menu
    * limits
@@ -426,9 +425,6 @@ class HMICapabilities {
   virtual bool driver_distraction_supported() const = 0;
 
   /*
-=======
-  /**
->>>>>>> origin/develop
    * @brief Interface used to store information regarding
    * the navigation "System Capability"
    * @param navigation_capability contains information related
@@ -487,9 +483,9 @@ class HMICapabilities {
   virtual const smart_objects::SmartObjectSPtr rc_capability() const = 0;
 
   virtual void set_driver_distraction_capability(
-      const smart_objects::SmartObject& rc_capability) = 0;
+      const smart_objects::SmartObject& driver_distraction_capability) = 0;
 
-  virtual const smart_objects::SmartObject* driver_distraction_capability()
+  virtual const smart_objects::SmartObjectSPtr driver_distraction_capability()
       const = 0;
 
   /**