diff options
7 files changed, 9 insertions, 8 deletions
@@ -16,6 +16,8 @@ Pull Requests Welcome! * [Transport Manager Programming Guide](https://app.box.com/s/1pjquttvmhf19uujtw4x4fv4t1leqasa) * [Software Detailed Design](https://app.box.com/s/ohgrvemtx39f8hfea1ab676xxrzvyx1y) * [Integration Guidelines](https://app.box.com/s/ohcgjv61cykgkuhycglju6cc4efr0ym3) + +<a href="http://www.youtube.com/watch?feature=player_embedded&v=AzdQdSCS24M" target="_blank"><img src="http://i.imgur.com/nm8UujD.png?1" alt="SmartDeviceLink" border="10" /></a> ## SDL Core diff --git a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc index 813f550919..58c6d7e192 100644 --- a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc +++ b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc @@ -408,13 +408,14 @@ void CreateInteractionChoiceSetRequest::onTimeOut() { if (!error_from_hmi_) { SendResponse(false, mobile_apis::Result::GENERIC_ERROR); } + DeleteChoices(); // We have to keep request alive until receive all responses from HMI // according to SDLAQ-CRS-2976 sync_primitives::AutoLock timeout_lock_(is_timed_out_lock_); is_timed_out_ = true; - ApplicationManagerImpl::instance()->updateRequestTimeout( - connection_key(), correlation_id(), 0); + ApplicationManagerImpl::instance()->TerminateRequest( + connection_key(), correlation_id()); } void CreateInteractionChoiceSetRequest::DeleteChoices() { diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc index 02d7520ea0..b1ac31b9d8 100644 --- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include <string.h> +#include <cstring> #include "application_manager/commands/mobile/perform_audio_pass_thru_request.h" #include "application_manager/application_manager_impl.h" #include "application_manager/application_impl.h" @@ -279,7 +279,7 @@ bool PerformAudioPassThruRequest::IsWhiteSpaceExist() { for (; it_ip != it_ip_end; ++it_ip) { str = (*it_ip)[strings::text].asCharArray(); - if (strlen(str) && !CheckSyntax(str)) { + if (std::strlen(str) && !CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid initial_prompt syntax check failed"); return true; } diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc index 5cdce194a3..5c7f3f0b5d 100644 --- a/src/components/application_manager/src/hmi_capabilities.cc +++ b/src/components/application_manager/src/hmi_capabilities.cc @@ -41,9 +41,7 @@ #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/message_helper.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/application_manager_impl.h" -#include "application_manager/message_helper.h" #include "formatters/CFormatterJsonBase.hpp" namespace application_manager { diff --git a/src/components/application_manager/src/message_helper.cc b/src/components/application_manager/src/message_helper.cc index 1ec93f8bad..bbe5bad19b 100644 --- a/src/components/application_manager/src/message_helper.cc +++ b/src/components/application_manager/src/message_helper.cc @@ -1267,9 +1267,7 @@ bool MessageHelper::CreateHMIApplicationStruct(ApplicationConstSharedPtr app, } const SmartObject* app_types = app->app_types(); - DCHECK_OR_RETURN(app_types, false); const SmartObject* ngn_media_screen_name = app->ngn_media_screen_name(); - DCHECK_OR_RETURN(ngn_media_screen_name, false); const connection_handler::DeviceHandle handle = app->device(); std::string device_name = ApplicationManagerImpl::instance()->GetDeviceName(handle); diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h index 153ef42050..ebdae7b958 100644 --- a/src/components/media_manager/include/media_manager/media_manager_impl.h +++ b/src/components/media_manager/include/media_manager/media_manager_impl.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_IMPL_H_ #include <string> +#include <map> #include "utils/singleton.h" #include "protocol_handler/protocol_observer.h" #include "protocol_handler/protocol_handler.h" diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc index 29be3cd219..c422d895d0 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc @@ -97,6 +97,7 @@ int FindPairedDevs(std::vector<bdaddr_t>* result) { } pclose(pipe); LOG4CXX_TRACE(logger_, "exit with 0"); + delete [] buffer; return 0; } } // namespace |