diff options
| author | Frank Ronneburg <fronneburg@xevo.com> | 2018-04-14 04:17:34 +0900 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-04-13 12:29:01 -0700 |
| commit | 0ed5e9cdd0f8f60fe4a7197956b4c723e04b338a (patch) | |
| tree | bc2addea53e81b65a2781adf7e8efbaf57c165cd /src/components/application_manager | |
| parent | 7fdf0dc10e38be1c7f7ad623a97e2a1461f2a4e7 (diff) | |
| download | sdl_core-0ed5e9cdd0f8f60fe4a7197956b4c723e04b338a.tar.gz | |
Merge pull request #252 in NAR/sdl-core from fix/minor_unit_test_fix to feature/Ford-WiFi
* commit '22c10e8af09be7e6ecfde11226017ab94742ee18':
minor unit test fix
Diffstat (limited to 'src/components/application_manager')
| -rw-r--r-- | src/components/application_manager/include/application_manager/application_manager_impl.h | 2 | ||||
| -rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 427626fdae..4f4dbe8f45 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -943,6 +943,7 @@ class ApplicationManagerImpl const int32_t session_key) OVERRIDE; void OnSecondaryTransportEndedCallback(const int32_t session_key) OVERRIDE; +#ifdef ENABLE_SECURITY /** * @brief Check if application with specified app_id has NAVIGATION HMI type * @param app_id id of application to check @@ -950,7 +951,6 @@ class ApplicationManagerImpl */ bool CheckAppIsNavi(const uint32_t app_id) const OVERRIDE; -#ifdef ENABLE_SECURITY /** * @brief Notification about protection result * @param connection_key Unique key of session which triggers handshake diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 1e2d39a3af..ab58bd270c 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -1826,6 +1826,7 @@ void ApplicationManagerImpl::OnSecondaryTransportEndedCallback( SendUpdateAppList(); } +#ifdef ENABLE_SECURITY bool ApplicationManagerImpl::CheckAppIsNavi(const uint32_t app_id) const { LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = application(app_id); @@ -1835,7 +1836,6 @@ bool ApplicationManagerImpl::CheckAppIsNavi(const uint32_t app_id) const { return false; } -#ifdef ENABLE_SECURITY bool ApplicationManagerImpl::OnHandshakeDone( uint32_t connection_key, security_manager::SSLContext::HandshakeResult result) { |