diff options
| author | JackLivio <jack@livio.io> | 2018-09-04 11:27:42 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2018-09-04 11:27:42 -0400 |
| commit | 548867072facaeb1d696b4534c8e64f9f9ea13d5 (patch) | |
| tree | c275015ac588514a5140145bad24d1688d6c6af7 /src/components/application_manager/src/hmi_interfaces_impl.cc | |
| parent | 6bb3a0e5d9938ddfbf36994fe9937d6fafb047b7 (diff) | |
| parent | ddc79ce414adcd966bdab61b814ce8a422e780f8 (diff) | |
| download | sdl_core-548867072facaeb1d696b4534c8e64f9f9ea13d5.tar.gz | |
Merge remote-tracking branch 'origin/develop' into fix/Wrong_connection_closure
# Conflicts:
# src/components/connection_handler/test/heart_beat_monitor_test.cc
Diffstat (limited to 'src/components/application_manager/src/hmi_interfaces_impl.cc')
| -rw-r--r-- | src/components/application_manager/src/hmi_interfaces_impl.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/components/application_manager/src/hmi_interfaces_impl.cc b/src/components/application_manager/src/hmi_interfaces_impl.cc index 4479665f64..452b5ab79d 100644 --- a/src/components/application_manager/src/hmi_interfaces_impl.cc +++ b/src/components/application_manager/src/hmi_interfaces_impl.cc @@ -61,8 +61,6 @@ generate_function_to_interface_convert_map() { HmiInterfaces::HMI_INTERFACE_BasicCommunication; convert_map[BasicCommunication_OnFileRemoved] = HmiInterfaces::HMI_INTERFACE_BasicCommunication; - convert_map[BasicCommunication_AllowDeviceToConnect] = - HmiInterfaces::HMI_INTERFACE_BasicCommunication; convert_map[BasicCommunication_OnDeviceChosen] = HmiInterfaces::HMI_INTERFACE_BasicCommunication; convert_map[BasicCommunication_OnFindApplications] = @@ -222,6 +220,13 @@ generate_function_to_interface_convert_map() { convert_map[SDL_GetURLS] = HmiInterfaces::HMI_INTERFACE_SDL; convert_map[RC_IsReady] = HmiInterfaces::HMI_INTERFACE_RC; convert_map[RC_GetCapabilities] = HmiInterfaces::HMI_INTERFACE_RC; + convert_map[Buttons_ButtonPress] = HmiInterfaces::HMI_INTERFACE_RC; + convert_map[RC_SetInteriorVehicleData] = HmiInterfaces::HMI_INTERFACE_RC; + convert_map[RC_GetInteriorVehicleData] = HmiInterfaces::HMI_INTERFACE_RC; + convert_map[RC_GetInteriorVehicleDataConsent] = + HmiInterfaces::HMI_INTERFACE_RC; + convert_map[RC_OnInteriorVehicleData] = HmiInterfaces::HMI_INTERFACE_RC; + convert_map[RC_OnRemoteControlSettings] = HmiInterfaces::HMI_INTERFACE_RC; return convert_map; } |