diff options
author | Andrey Oleynik (GitHub) <aoleynik@luxoft.com> | 2017-09-21 17:40:49 +0300 |
---|---|---|
committer | Andriy Byzhynar <AByzhynar@luxoft.com> | 2018-01-18 11:28:38 +0200 |
commit | 8fa4f3b498916b89552394d25f9482ce4b06de5a (patch) | |
tree | 3661ecaf592fa16571f32d32917426b6b49047a8 /src/components/application_manager/src | |
parent | a4af51700fe245aff66250c93f78741dc96584cb (diff) | |
download | sdl_core-8fa4f3b498916b89552394d25f9482ce4b06de5a.tar.gz |
Adds descriptions, removes unused code
Diffstat (limited to 'src/components/application_manager/src')
-rw-r--r-- | src/components/application_manager/src/application_impl.cc | 1 | ||||
-rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 27 |
2 files changed, 24 insertions, 4 deletions
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 21847ffa1d..467d606f06 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -117,7 +117,6 @@ ApplicationImpl::ApplicationImpl( , put_file_in_none_count_(0) , delete_file_in_none_count_(0) , list_files_in_none_count_(0) - , device_(0) , mac_address_(mac_address) , device_id_(device_id) , usage_report_(mobile_app_id, statistics_manager) diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 65da6ed87e..20083702d4 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -98,6 +98,12 @@ DeviceTypes devicesType = { std::make_pair(std::string("WIFI"), hmi_apis::Common_TransportType::WIFI)}; } +/** + * @brief device_id_comparator is predicate to compare application device id + * @param device_id Device id to compare with + * @param app Application pointer + * @return True if device id of application matches to device id passed + */ bool device_id_comparator(const std::string& device_id, ApplicationSharedPtr app) { LOG4CXX_DEBUG(logger_, @@ -107,6 +113,13 @@ bool device_id_comparator(const std::string& device_id, return device_id == app->mac_address(); } +/** + * @brief policy_app_id_comparator is predicate to compare policy application + * ids + * @param policy_app_id Policy id of application + * @param app Application pointer + * @return True if policy id of application matches to policy id passed + */ bool policy_app_id_comparator(const std::string& policy_app_id, ApplicationSharedPtr app) { DCHECK_OR_RETURN(app, false); @@ -1516,6 +1529,17 @@ void ApplicationManagerImpl::OnServiceEndedCallback( << type << " with reason " << close_reason << " in session 0x" << std::hex << session_key); + auto app = application(static_cast<uint32_t>(session_key)); + if (!app) { + return; + } + + if (IsAppInReconnectMode(app->policy_app_id())) { + LOG4CXX_DEBUG(logger_, + "Application is in reconnection list and won't be closed."); + return; + } + if (type == kRpc) { LOG4CXX_INFO(logger_, "Remove application."); /* In case it was unexpected disconnect or some special case @@ -3681,7 +3705,6 @@ bool ApplicationManagerImpl::IsApplicationForbidden( return forbidden_applications.find(name) != forbidden_applications.end(); } -// TODO: check its usage bool ApplicationManagerImpl::IsAppInReconnectMode( const std::string& policy_app_id) const { LOG4CXX_AUTO_TRACE(logger_); @@ -4014,8 +4037,6 @@ void ApplicationManagerImpl::ProcessReconnection( EraseAppFromReconnectionList(application); - connection_handler().OnDeviceConnectionSwitched(device_mac); - SwitchApplication(application, connection_key, new_device_id); // Update connection type for existed device. |