diff options
| author | Andrii Kalinich (GitHub) <AKalinich@luxoft.com> | 2017-09-05 18:19:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 18:19:00 +0300 |
| commit | 1ab51618c49e7bd2c0c45c952edb16f8fe8d5b2f (patch) | |
| tree | 47ed0a8a9fd7acb28d38d72e42588f0a5f63c4a4 /src/components/application_manager/src/hmi_interfaces_impl.cc | |
| parent | d96b7c509b74da521b99c1f4cdbb0d54f198395e (diff) | |
| parent | d33bfa260cd13494b9f6f1b4993e936e60ef2f27 (diff) | |
| download | sdl_core-1ab51618c49e7bd2c0c45c952edb16f8fe8d5b2f.tar.gz | |
Merge branch 'develop' into feature/sdl_remote_control_baseline
Diffstat (limited to 'src/components/application_manager/src/hmi_interfaces_impl.cc')
| -rw-r--r-- | src/components/application_manager/src/hmi_interfaces_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/application_manager/src/hmi_interfaces_impl.cc b/src/components/application_manager/src/hmi_interfaces_impl.cc index e961c4e4d0..4479665f64 100644 --- a/src/components/application_manager/src/hmi_interfaces_impl.cc +++ b/src/components/application_manager/src/hmi_interfaces_impl.cc @@ -2,6 +2,9 @@ * Copyright (c) 2016, Ford Motor Company * All rights reserved. * + * Copyright (c) 2017 Xevo Inc. + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * @@ -13,7 +16,7 @@ * disclaimer in the documentation and/or other materials provided with the * distribution. * - * Neither the name of the Ford Motor Company nor the names of its contributors + * Neither the name of the copyright holders nor the names of their contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -155,6 +158,7 @@ generate_function_to_interface_convert_map() { convert_map[UI_IsReady] = HmiInterfaces::HMI_INTERFACE_UI; convert_map[UI_ClosePopUp] = HmiInterfaces::HMI_INTERFACE_UI; convert_map[UI_OnResetTimeout] = HmiInterfaces::HMI_INTERFACE_UI; + convert_map[UI_SendHapticData] = HmiInterfaces::HMI_INTERFACE_UI; convert_map[Navigation_IsReady] = HmiInterfaces::HMI_INTERFACE_Navigation; convert_map[Navigation_SendLocation] = HmiInterfaces::HMI_INTERFACE_Navigation; |