diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-08-28 15:21:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 15:21:58 -0400 |
| commit | 49841afec293e7f7162cf5ea16df0593cb7dbce6 (patch) | |
| tree | 6121d0d6510208cac442ac6e1a84bdc2e4c76dc7 /src/components/application_manager/src | |
| parent | 70522acade78043f5c08c3f73af9793312cef000 (diff) | |
| parent | 721fcfec20f26ff86dcbd652d12e7cc26e355b7f (diff) | |
| download | sdl_core-feature/3rd_party_travis_cache.tar.gz | |
Merge branch 'develop' into feature/3rd_party_travis_cachefeature/3rd_party_travis_cache
Diffstat (limited to 'src/components/application_manager/src')
| -rw-r--r-- | src/components/application_manager/src/hmi_capabilities_impl.cc | 2 | ||||
| -rw-r--r-- | src/components/application_manager/src/rpc_handler_impl.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index d00fc2ae19..806feac58a 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -99,6 +99,8 @@ void InitCapabilities() { button_enum_name.insert( std::make_pair(std::string("OK"), hmi_apis::Common_ButtonName::OK)); button_enum_name.insert(std::make_pair( + std::string("PLAY_PAUSE"), hmi_apis::Common_ButtonName::PLAY_PAUSE)); + button_enum_name.insert(std::make_pair( std::string("SEEKLEFT"), hmi_apis::Common_ButtonName::SEEKLEFT)); button_enum_name.insert(std::make_pair( std::string("SEEKRIGHT"), hmi_apis::Common_ButtonName::SEEKRIGHT)); diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index a605795b6e..54f85c6c0a 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -219,7 +219,8 @@ void RPCHandlerImpl::GetMessageVersion( } utils::SemanticVersion temp_version(major, minor, patch); if (temp_version.isValid()) { - message_version = temp_version; + utils::SemanticVersion ver_4_5(4, 5, 0); + message_version = (temp_version > ver_4_5) ? temp_version : ver_4_5; } } } @@ -251,10 +252,7 @@ bool RPCHandlerImpl::ConvertMessageToSO( // Attach RPC version to SmartObject if it does not exist yet. auto app_ptr = app_manager_.application(message.connection_key()); utils::SemanticVersion msg_version(0, 0, 0); - if (app_ptr && - (output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] - .keyExists(NsSmartDeviceLink::NsJSONHandler::strings:: - S_RPC_MSG_VERSION) == false)) { + if (app_ptr) { msg_version = app_ptr->msg_version(); } else if (mobile_apis::FunctionID::RegisterAppInterfaceID == static_cast<mobile_apis::FunctionID::eType>( |