diff options
| author | collin <collin+i@collinmcqueen.com> | 2020-09-30 10:42:49 -0400 |
|---|---|---|
| committer | collin <collin+i@collinmcqueen.com> | 2020-09-30 10:42:49 -0400 |
| commit | 16efa37f8ca5f8cb22831c1c49e7740610352546 (patch) | |
| tree | 17e3be38a59b52af699f0fb9d3719c4e0e112212 | |
| parent | d89f8418b1a1ad39aee601e5f1b958d066a44642 (diff) | |
| parent | 9f61819139ad4944b73257893936d1328eed15b0 (diff) | |
| download | sdl_core-16efa37f8ca5f8cb22831c1c49e7740610352546.tar.gz | |
Merge branch 'develop' into release/7.0.0
2 files changed, 2 insertions, 0 deletions
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc index 0863dc875a..da925e68e7 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc @@ -80,6 +80,7 @@ void VISubscribeVehicleDataRequest::Run() { void VISubscribeVehicleDataRequest::onTimeOut() { event_engine::Event timeout_event( hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData); + SDL_LOG_AUTO_TRACE(); auto error_response = MessageHelper::CreateNegativeResponseFromHmi( function_id(), diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc index efbb81952b..6721d93658 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc @@ -139,6 +139,7 @@ void VehicleInfoPendingResumptionHandler::RaiseFinishedPendingResumption( ext.subscribeToVehicleInfo(subscription); } + unsubscribe_from_event(VehicleInfo_SubscribeVehicleData); auto fake_response = CreateFakeResponseFromHMI(pending_resumption.subscription_results_, pending_resumption.fake_corr_id_); |