diff options
| author | mked-luxoft <mked@luxoft.com> | 2019-08-29 18:58:19 +0300 |
|---|---|---|
| committer | mked-luxoft <mked@luxoft.com> | 2019-08-29 20:31:04 +0300 |
| commit | 8d85b72adb1b25da1d760c897198d43b52ed9975 (patch) | |
| tree | 75d35eac19de42817e387b91250faab94f7e4e70 | |
| parent | e0f98265a13599b4c8c88df4e6aba58b9ba35a20 (diff) | |
| download | sdl_core-feature/service_status_update_to_hmi.tar.gz | |
fixup! Fixes after rebasefeature/service_status_update_to_hmi
3 files changed, 3 insertions, 1 deletions
diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h index da1a99fcde..bf0e03b0b8 100644 --- a/src/components/include/policy/policy_external/policy/policy_manager.h +++ b/src/components/include/policy/policy_external/policy/policy_manager.h @@ -53,7 +53,7 @@ typedef std::shared_ptr<utils::Callable> StatusNotifier; class PolicyManager : public usage_statistics::StatisticsManager, public PolicyEncryptionFlagGetterInterface, - public PTURetryHandler { + public PTURetryHandler { public: /** * @brief The NotificationMode enum defines whether application will be diff --git a/src/components/include/test/protocol_handler/mock_protocol_handler.h b/src/components/include/test/protocol_handler/mock_protocol_handler.h index df75c71c49..354c797c24 100644 --- a/src/components/include/test/protocol_handler/mock_protocol_handler.h +++ b/src/components/include/test/protocol_handler/mock_protocol_handler.h @@ -69,6 +69,7 @@ class MockProtocolHandler : public ::protocol_handler::ProtocolHandler { std::vector<std::string>& rejected_params)); MOCK_METHOD0(NotifyOnGetSystemTimeFailed, void()); MOCK_CONST_METHOD1(IsRPCServiceSecure, bool(const uint32_t connection_key)); + MOCK_METHOD0(ProcessFailedPTU, void()); #ifdef EXTERNAL_PROPRIETARY_MODE MOCK_METHOD0(ProcessFailedCertDecrypt, void()); #endif diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index 643e6a9fff..268af48fdc 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -1601,6 +1601,7 @@ const ServiceStatus ProtocolHandlerImpl::ServiceDisallowedBySettings( const ConnectionID connection_id, const uint8_t session_id, const bool protection) const { + LOG4CXX_AUTO_TRACE(logger_); const std::string& transport = session_observer_.TransportTypeProfileStringFromConnHandle(connection_id); |