diff options
author | agaliuzov <agaliuzov@luxoft.com> | 2016-05-02 03:12:51 -0700 |
---|---|---|
committer | agaliuzov <agaliuzov@luxoft.com> | 2016-05-02 03:12:51 -0700 |
commit | 10884727acbba22c6d7c9d96a8b46d0184c8bc4e (patch) | |
tree | c1488658fffafbd3fae531eb1f43b0da1fa83486 | |
parent | 9bbc8801ac2b8eca90b12dd4e2b5bb5416bc6ace (diff) | |
parent | 58dafada90a5fc8bc9de50069d0b99d61fca511b (diff) | |
download | sdl_core-10884727acbba22c6d7c9d96a8b46d0184c8bc4e.tar.gz |
Merge branch 'master' into develop
-rw-r--r-- | LICENSE | 27 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | src/components/application_manager/src/hmi_capabilities.cc | 1 | ||||
-rw-r--r-- | src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc | 1 |
4 files changed, 30 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..54d44277e4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2014 Ford Motor Company, +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of Ford Motor Company nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file @@ -1,5 +1,5 @@ -##### Note: Please use the [develop](https://github.com/smartdevicelink/sdl_core/tree/develop) or [master](https://github.com/smartdevicelink/sdl_core) branches of sdl_core for the most stable versions. - +[![Slack Status](http://sdlslack.herokuapp.com/badge.svg)](http://slack.smartdevicelink.org) + # SmartDeviceLink (SDL) SmartDeviceLink (SDL) is a standard set of protocols and messages that connect applications on a smartphone to a vehicle head unit. This messaging enables a consumer to interact with their application using common in-vehicle interfaces such as a touch screen display, embedded voice recognition, steering wheel controls and various vehicle knobs and buttons. There are three main components that make up the SDL ecosystem. diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc index a5a35daa36..c8b4d16d45 100644 --- a/src/components/application_manager/src/hmi_capabilities.cc +++ b/src/components/application_manager/src/hmi_capabilities.cc @@ -41,7 +41,6 @@ #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.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 |