diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2016-01-25 13:23:00 -0500 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2016-01-25 13:23:00 -0500 |
| commit | 58dafada90a5fc8bc9de50069d0b99d61fca511b (patch) | |
| tree | 3f2b15a92961f5e328dd94e3b0d361e85a38e54c | |
| parent | c52b9875f0b0169663f9afebed4d676d090160cc (diff) | |
| parent | b95caf809a2ae1601c2a555ec51560a1f28661ba (diff) | |
| download | sdl_core-58dafada90a5fc8bc9de50069d0b99d61fca511b.tar.gz | |
Merge branch 'master' of github.com:smartdevicelink/sdl_core
3 files changed, 1 insertions, 4 deletions
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/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 |