diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 16:43:46 -0400 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 17:04:55 -0400 |
| commit | b8d3227c3421f9408fbba3c7d392d4ae68790bfa (patch) | |
| tree | f60eb58045351d9fb32ab33af8eb91ecdea3a4b2 /src/components/application_manager/src/policies/policy_handler.cc | |
| parent | 92d03d64236864a191c5e8ab9fa3c1c35111a486 (diff) | |
| parent | 3ca6e219ad6325e4ae5486df0f1071c90430a259 (diff) | |
| download | sdl_core-b8d3227c3421f9408fbba3c7d392d4ae68790bfa.tar.gz | |
Merge remote-tracking branch 'origin/feature/remove_qt_hmi_api_dbus' into develop
# Conflicts:
# src/components/application_manager/CMakeLists.txt
# src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h
# src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
# src/components/application_manager/src/hmi_command_factory.cc
# src/components/application_manager/src/message_helper/message_helper.cc
# src/components/application_manager/test/commands/hmi/dummy_hmi_commands_test.cc
# src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
# src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc
Diffstat (limited to 'src/components/application_manager/src/policies/policy_handler.cc')
| -rw-r--r-- | src/components/application_manager/src/policies/policy_handler.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 1cff7b7c96..88c01c7af7 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -1083,12 +1083,7 @@ bool PolicyHandler::ReceiveMessageFromSDK(const std::string& file, SetDaysAfterEpoch(); event_observer_->subscribe_on_event( -#ifdef HMI_DBUS_API - hmi_apis::FunctionID::VehicleInfo_GetOdometer, correlation_id -#else - hmi_apis::FunctionID::VehicleInfo_GetVehicleData, correlation_id -#endif - ); + hmi_apis::FunctionID::VehicleInfo_GetVehicleData, correlation_id); std::vector<std::string> vehicle_data_args; vehicle_data_args.push_back(strings::odometer); MessageHelper::CreateGetVehicleDataRequest( |