summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevhenii Dementieiev (GitHub) <ydementieiev@luxoft.com>2020-01-16 17:52:36 +0200
committersniukalov <sniukaov@luxoft.com>2020-02-06 19:57:50 +0200
commit5bf6af4c27e11cbd511eb4baaa1e3001f375c91a (patch)
tree2ba3fb1a42a9c7fbfad276532d787d9c059e8a91
parent549f3597657ef79ab2cc6e7b367f73aaf581e45c (diff)
downloadsdl_core-5bf6af4c27e11cbd511eb4baaa1e3001f375c91a.tar.gz
fixup! Start the new PTU after a failed retry sequence in case some trigger occurs during the retry sequence
-rw-r--r--src/components/include/application_manager/policies/policy_handler_interface.h2
-rw-r--r--src/components/policy/policy_external/include/policy/policy_manager_impl.h4
-rw-r--r--src/components/policy/policy_regular/include/policy/policy_manager_impl.h4
-rw-r--r--src/components/policy/policy_regular/src/policy_manager_impl.cc2
4 files changed, 2 insertions, 10 deletions
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
index ac392b3034..cb940c18ae 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -411,7 +411,7 @@ class PolicyHandlerInterface : public VehicleDataItemProvider {
virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0;
/**
- * @brief Notify that new applocation was added to application list
+ * @brief Notify that new application was added to application list
* @param new_app_id app_id for this application
* @param policy_id policy_id for this application
*/
diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
index 5422f751f5..e110ff375d 100644
--- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
@@ -608,10 +608,6 @@ class PolicyManagerImpl : public PolicyManager {
*/
void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
- /**
- * @brief Change applications count ready for PTU
- * @param new_app_count new applications count for PTU
- */
void OnChangeApplicationCount(const uint32_t new_app_count) OVERRIDE;
/**
diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
index b673fad7c3..1793ce2f72 100644
--- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
@@ -624,10 +624,6 @@ class PolicyManagerImpl : public PolicyManager {
*/
void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
- /**
- * @brief Change applications count ready for PTU
- * @param new_app_count new applications count for PTU
- */
void OnChangeApplicationCount(const uint32_t new_app_count) OVERRIDE;
/**
diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index ddff7b7cca..0d97ab69b8 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -692,7 +692,7 @@ void PolicyManagerImpl::OnChangeApplicationCount(const uint32_t new_app_count) {
void PolicyManagerImpl::OnAppRegisteredOnMobile(
const std::string& device_id, const std::string& application_id) {
- if (last_registered_policy_app_id_ != application_id) {
+ if (application_id != last_registered_policy_app_id_) {
StartPTExchange();
last_registered_policy_app_id_ = application_id;
}