diff options
| author | Andrey Oleynik <aoleynik@luxoft.com> | 2017-08-17 10:01:21 +0300 |
|---|---|---|
| committer | Andrey Oleynik <aoleynik@luxoft.com> | 2017-08-17 10:01:21 +0300 |
| commit | d1ea5c8333ee3b846fe3b3f6bda50e73d6985190 (patch) | |
| tree | 7bb8e853a296ef8035796cea66dfd25d9c36d042 /src/components/include/application_manager | |
| parent | df2a2ff289e95cc2a2f4332199da920eea5562c9 (diff) | |
| download | sdl_core-d1ea5c8333ee3b846fe3b3f6bda50e73d6985190.tar.gz | |
Fixes after rebasing on develop
Diffstat (limited to 'src/components/include/application_manager')
| -rw-r--r-- | src/components/include/application_manager/hmi_capabilities.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h index 5856f2aff5..99e755e59b 100644 --- a/src/components/include/application_manager/hmi_capabilities.h +++ b/src/components/include/application_manager/hmi_capabilities.h @@ -412,7 +412,6 @@ class HMICapabilities { */ virtual bool phone_call_supported() const = 0; -<<<<<<< e8f4b4fef6ccb7106fe0a0c4e2b4e828e20ee926 /* * @brief Interface to store whether HMI supports video streaming * @@ -434,8 +433,6 @@ class HMICapabilities { * @param navigation_capability contains information related * to the navigation system capability. */ -======= ->>>>>>> Implementation of system capabilities virtual void set_navigation_capability( const smart_objects::SmartObject& navigation_capability) = 0; @@ -446,7 +443,6 @@ class HMICapabilities { virtual const smart_objects::SmartObject* phone_capability() const = 0; -<<<<<<< e8f4b4fef6ccb7106fe0a0c4e2b4e828e20ee926 /* * @brief Sets HMI's video streaming related capability information * @@ -462,12 +458,10 @@ class HMICapabilities { */ virtual const smart_objects::SmartObject* video_streaming_capability() const = 0; -======= virtual void set_rc_capability( const smart_objects::SmartObject& rc_capability) = 0; virtual const smart_objects::SmartObject* rc_capability() const = 0; ->>>>>>> Implementation of system capabilities virtual void Init(resumption::LastState* last_state) = 0; |