diff options
| author | Andrii Kalinich <AKalinich@luxoft.com> | 2019-10-23 09:03:21 -0400 |
|---|---|---|
| committer | Andrii Kalinich <AKalinich@luxoft.com> | 2019-10-23 09:03:21 -0400 |
| commit | b6060b86c65aa0d5fedc207fb399ad9fcfbc9e4b (patch) | |
| tree | 257593483a78a1b23a7a1e6c5859d06b45e6bf54 | |
| parent | 52c2a77f38301dc3f9fd6485736ca51e421c01df (diff) | |
| download | sdl_core-fix/fix_vd_items_subscription_after_ptu.tar.gz | |
fixup! Fix sending of UnsubscribeVehicleDatafix/fix_vd_items_subscription_after_ptu
4 files changed, 5 insertions, 5 deletions
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h index 487cf164a2..f0f68af298 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h @@ -72,7 +72,7 @@ class VehicleInfoPlugin : public plugins::RPCPlugin { VehicleInfoAppExtension& ext); private: - void UnsubscribeFromNonExistingVDItems(); + void UnsubscribeFromRemovedVDItems(); smart_objects::SmartObjectSPtr GetUnsubscribeIVIRequest( const std::vector<std::string>& ivi_names); void DeleteSubscriptions(app_mngr::ApplicationSharedPtr app); diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc index c8c4d99a27..40da7501c1 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc @@ -81,7 +81,7 @@ app_mngr::CommandFactory& VehicleInfoPlugin::GetCommandFactory() { } void VehicleInfoPlugin::OnPolicyEvent(plugins::PolicyEvent event) { - UnsubscribeFromNonExistingVDItems(); + UnsubscribeFromRemovedVDItems(); custom_vehicle_data_manager_->OnPolicyEvent(event); } @@ -97,7 +97,7 @@ void VehicleInfoPlugin::OnApplicationEvent( } } -void VehicleInfoPlugin::UnsubscribeFromNonExistingVDItems() { +void VehicleInfoPlugin::UnsubscribeFromRemovedVDItems() { typedef std::vector<std::string> StringsVector; auto get_items_to_unsubscribe = [this]() -> StringsVector { diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc index 9308f0c52b..e1015ea574 100644 --- a/src/components/policy/policy_external/src/cache_manager.cc +++ b/src/components/policy/policy_external/src/cache_manager.cc @@ -1971,7 +1971,7 @@ policy_table::VehicleDataItems CacheManager::CalculateCustomVdItemsDiff( } LOG4CXX_DEBUG(logger_, - "Was found " << removed_items.size() << " removed VD items"); + "Found " << removed_items.size() << " removed VD items"); return removed_items; } diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index cc278180f9..9c73d88e63 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -1272,7 +1272,7 @@ policy_table::VehicleDataItems CacheManager::CalculateCustomVdItemsDiff( } LOG4CXX_DEBUG(logger_, - "Was found " << removed_items.size() << " removed VD items"); + "Found " << removed_items.size() << " removed VD items"); return removed_items; } |