fixup! Start the new PTU after a failed retry sequence in case some trigger occurs during the retry sequence

20 files changed, 83 insertions, 76 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 a599581062..5631be64d8 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
@@ -1610,7 +1610,7 @@ class ApplicationManagerImpl
 
   uint32_t apps_size_;
 
-  bool is_registered_in_timeout_;
+  std::atomic<bool> registered_during_timer_execution_;
 
   volatile bool is_stopping_;
 
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index dd25c48403..7d99a67bbc 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -183,7 +183,8 @@ class PolicyHandler : public PolicyHandlerInterface,
                          const std::string& policy_app_id,
                          const std::string& hmi_level) OVERRIDE;
 
-  void OnPTUTimeOut();
+  void OnPTUTimeOut() OVERRIDE;
+
   /**
    * Gets all allowed module types
    * @param app_id unique identifier of application
@@ -423,16 +424,16 @@ class PolicyHandler : public PolicyHandlerInterface,
   uint32_t GetAppIdForSending() const OVERRIDE;
 
   /**
-   * @brief Add application to PTU queue if don't have application
-   * with the same app_id
+   * @brief Add application to PTU queue if no application with
+   * the same app id exists
    * @param new_app_id app id new application
    */
-  void AddNewApplicationIdToPTUQueue(const uint32_t new_app_id);
+  void PushAppIdToQueue(const uint32_t new_app_id);
 
   /**
-   * @brief Remove first from queue application
+   * @brief Remove the first application from applications queue
    */
-  void RemoveApplicationFromPTUQueue();
+  void PopAppIdFromQueue();
 
   custom_str::CustomString GetAppName(
       const std::string& policy_app_id) OVERRIDE;
@@ -595,18 +596,13 @@ class PolicyHandler : public PolicyHandlerInterface,
    */
   void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
 
-  /**
-   * @brief New application was added to application list
-   * @param new_app_id app_id for this application
-   * @param policy_id policy_id for this application
-   */
   void OnAddedNewApplicationToAppList(const uint32_t new_app_id,
-                                      const std::string policy_id) OVERRIDE;
+                                      const std::string& policy_id) OVERRIDE;
 
   /**
-   * @brief Application queue ready for PTU
+   * @brief Queue applications for which PTU has not yet been completed
    */
-  std::vector<uint32_t> queue_applications_for_ptu_;
+  std::set<uint32_t> queue_applications_for_ptu_;
 
   /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
@@ -905,6 +901,7 @@ class PolicyHandler : public PolicyHandlerInterface,
   typedef std::list<PolicyHandlerObserver*> HandlersCollection;
   HandlersCollection listeners_;
   mutable sync_primitives::Lock listeners_lock_;
+  mutable sync_primitives::Lock app_id_queue_lock_;
 
   /**
    * @brief Application-to-device links are used for collecting their current
@@ -919,7 +916,7 @@ class PolicyHandler : public PolicyHandlerInterface,
   std::shared_ptr<StatisticManagerImpl> statistic_manager_impl_;
   const PolicySettings& settings_;
   application_manager::ApplicationManager& application_manager_;
-  std::string last_registered_app_id_;
+  std::string last_registered_policy_app_id_;
 
   friend class AppPermissionDelegate;
 
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 459dfab7eb..99077a6e04 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -196,7 +196,7 @@ ApplicationManagerImpl::ApplicationManagerImpl(
                             this, &ApplicationManagerImpl::ClearTimerPool))
     , is_low_voltage_(false)
     , apps_size_(0)
-    , is_registered_in_timeout_(false)
+    , registered_during_timer_execution_(false)
     , is_stopping_(false) {
   std::srand(std::time(nullptr));
   AddPolicyObserver(this);
@@ -3828,7 +3828,7 @@ bool ApplicationManagerImpl::IsHMICooperating() const {
 
 void ApplicationManagerImpl::OnApplicationListUpdateTimer() {
   LOG4CXX_DEBUG(logger_, "Application list update timer finished");
-  is_registered_in_timeout_ = false;
+  registered_during_timer_execution_ = false;
   apps_to_register_list_lock_ptr_->Acquire();
   const bool trigger_ptu = apps_size_ != applications_.size();
   apps_to_register_list_lock_ptr_->Release();
@@ -4291,10 +4291,10 @@ void ApplicationManagerImpl::AddAppToRegisteredAppList(
       "App with app_id: " << application->app_id()
                           << " has been added to registered applications list");
   if (application_list_update_timer_.is_running() &&
-      !is_registered_in_timeout_) {
+      !registered_during_timer_execution_) {
     GetPolicyHandler().OnAddedNewApplicationToAppList(
         application->app_id(), application->policy_app_id());
-    is_registered_in_timeout_ = true;
+    registered_during_timer_execution_ = true;
   }
   apps_size_ = static_cast<uint32_t>(applications_.size());
 }
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index eddd8b2b9f..32589c90bd 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -302,7 +302,7 @@ PolicyHandler::PolicyHandler(const PolicySettings& settings,
     , statistic_manager_impl_(std::make_shared<StatisticManagerImpl>(this))
     , settings_(settings)
     , application_manager_(application_manager)
-    , last_registered_app_id_("") {}
+    , last_registered_policy_app_id_("") {}
 
 PolicyHandler::~PolicyHandler() {}
 
@@ -466,21 +466,19 @@ uint32_t PolicyHandler::GetAppIdForSending() const {
   return ChooseRandomAppForPolicyUpdate(apps_with_none_level);
 }
 
-void PolicyHandler::AddNewApplicationIdToPTUQueue(const uint32_t app_id) {
+void PolicyHandler::PushAppIdToQueue(const uint32_t app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-
-  if (std::find(queue_applications_for_ptu_.begin(),
-                queue_applications_for_ptu_.end(),
-                app_id) == queue_applications_for_ptu_.end()) {
-    queue_applications_for_ptu_.push_back(app_id);
+  sync_primitives::AutoLock lock(app_id_queue_lock_);
+  const auto result = queue_applications_for_ptu_.insert(app_id);
+  if (result.second) {
     policy_manager_->OnChangeApplicationCount(
         queue_applications_for_ptu_.size());
   }
 }
 
-void PolicyHandler::RemoveApplicationFromPTUQueue() {
+void PolicyHandler::PopAppIdFromQueue() {
   LOG4CXX_AUTO_TRACE(logger_);
-
+  sync_primitives::AutoLock lock(app_id_queue_lock_);
   if (queue_applications_for_ptu_.size() > 0) {
     queue_applications_for_ptu_.erase(queue_applications_for_ptu_.begin());
     policy_manager_->OnChangeApplicationCount(
@@ -1146,7 +1144,7 @@ bool PolicyHandler::ReceiveMessageFromSDK(const std::string& file,
   const bool is_ptu_successful =
       load_pt_result == PolicyManager::PtProcessingResult::kSuccess;
   OnPTUFinished(is_ptu_successful);
-  RemoveApplicationFromPTUQueue();
+  PopAppIdFromQueue();
   if (is_ptu_successful) {
     LOG4CXX_INFO(logger_, "PTU was successful.");
     policy_manager_->CleanupUnpairedDevices();
@@ -1522,8 +1520,9 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& device_id,
                     << policy_app_id << " and connection_key "
                     << app->app_id());
 }
+
 void PolicyHandler::OnPTUTimeOut() {
-  RemoveApplicationFromPTUQueue();
+  PopAppIdFromQueue();
 #ifndef EXTERNAL_PROPRIETARY_MODE
   application_manager_.protocol_handler().ProcessFailedPTU();
 #endif
@@ -1939,7 +1938,7 @@ void PolicyHandler::OnPTUFinished(const bool ptu_result) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(listeners_lock_);
   if (!ptu_result) {
-    RemoveApplicationFromPTUQueue();
+    PopAppIdFromQueue();
   }
   std::for_each(
       listeners_.begin(),
@@ -2239,12 +2238,13 @@ void PolicyHandler::OnAppsSearchCompleted(const bool trigger_ptu) {
 }
 
 void PolicyHandler::OnAddedNewApplicationToAppList(
-    const uint32_t new_app_id, const std::string policy_id) {
-  if (last_registered_app_id_ == policy_id) {
+    const uint32_t new_app_id, const std::string& policy_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (policy_id == last_registered_policy_app_id_) {
     return;
   }
-  last_registered_app_id_ = policy_id;
-  AddNewApplicationIdToPTUQueue(new_app_id);
+  last_registered_policy_app_id_ = policy_id;
+  PushAppIdToQueue(new_app_id);
 }
 
 void PolicyHandler::OnAppRegisteredOnMobile(const std::string& device_id,
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 d304521fe2..ac392b3034 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -416,7 +416,7 @@ class PolicyHandlerInterface : public VehicleDataItemProvider {
    * @param policy_id policy_id for this application
    */
   virtual void OnAddedNewApplicationToAppList(const uint32_t new_app_id,
-                                              const std::string policy_id) = 0;
+                                              const std::string& policy_id) = 0;
 
   /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
@@ -661,6 +661,12 @@ class PolicyHandlerInterface : public VehicleDataItemProvider {
                                  const std::string& hmi_level) = 0;
 
   /**
+   * @brief OnPTUTimeOut the callback which is performed when PTU timeout
+   * occurred
+   */
+  virtual void OnPTUTimeOut() = 0;
+
+  /**
    * Gets all allowed module types
    * @param app_id unique identifier of application
    * @param list of allowed module types
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 be748caf02..ee454b4b19 100644
--- a/src/components/include/policy/policy_external/policy/policy_manager.h
+++ b/src/components/include/policy/policy_external/policy/policy_manager.h
@@ -534,7 +534,7 @@ class PolicyManager : public usage_statistics::StatisticsManager,
   virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0;
 
   /**
-   * @brief Change applicatios count ready for PTU
+   * @brief Change applications count ready for PTU
    * @param new_app_count new applications count for PTU
    */
   virtual void OnChangeApplicationCount(const uint32_t new_app_count) = 0;
diff --git a/src/components/include/policy/policy_regular/policy/policy_listener.h b/src/components/include/policy/policy_regular/policy/policy_listener.h
index bbe220060e..9f41ad9bc1 100644
--- a/src/components/include/policy/policy_regular/policy/policy_listener.h
+++ b/src/components/include/policy/policy_regular/policy/policy_listener.h
@@ -121,7 +121,8 @@ class PolicyListener {
   virtual void OnCertificateUpdated(const std::string& certificate_data) = 0;
 
   /**
-   * @brief OnPTUTimeOut the callback which signals if PTU timeout occured
+   * @brief OnPTUTimeOut the callback which is performed when PTU timeout
+   * occurred
    */
   virtual void OnPTUTimeOut() = 0;
 
diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h
index bc546ed98c..0385a8c93a 100644
--- a/src/components/include/policy/policy_regular/policy/policy_manager.h
+++ b/src/components/include/policy/policy_regular/policy/policy_manager.h
@@ -525,7 +525,7 @@ class PolicyManager : public usage_statistics::StatisticsManager,
   virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0;
 
   /**
-   * @brief Change applicatios count ready for PTU
+   * @brief Change applications count ready for PTU
    * @param new_app_count new applications count for PTU
    */
   virtual void OnChangeApplicationCount(const uint32_t new_app_count) = 0;
diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
index 57b95e8785..fe38f59051 100644
--- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
+++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
@@ -220,7 +220,7 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
   MOCK_METHOD0(OnAppsSearchStarted, void());
   MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu));
   MOCK_METHOD2(OnAddedNewApplicationToAppList,
-               void(const uint32_t new_app_id, const std::string policy_id));
+               void(const uint32_t new_app_id, const std::string& policy_id));
   MOCK_METHOD2(OnAppRegisteredOnMobile,
                void(const std::string& device_id,
                     const std::string& application_id));
@@ -318,6 +318,7 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                void(const std::string& device_id,
                     const std::string& policy_app_id,
                     const std::string& hmi_level));
+  MOCK_METHOD0(OnPTUTimeOut, void());
   MOCK_CONST_METHOD2(GetModuleTypes,
                      bool(const std::string& policy_app_id,
                           std::vector<std::string>* modules));
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 d244a2c0f5..5422f751f5 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
@@ -609,7 +609,7 @@ class PolicyManagerImpl : public PolicyManager {
   void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
 
   /**
-   * @brief Change applicatios count ready for PTU
+   * @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;
@@ -1103,9 +1103,9 @@ class PolicyManagerImpl : public PolicyManager {
                  policy_table::PolicyTableType type) const;
 
   /**
-   * @brief Check that application for PTU more than zero
+   * @brief Check that new applications for PTU were registered
    */
-  bool HasApplicationForPTU();
+  bool HasApplicationForPTU() const;
 
   /**
    * @brief Get resulting RPCs permissions for application which started on
@@ -1319,9 +1319,9 @@ class PolicyManagerImpl : public PolicyManager {
   uint32_t retry_sequence_index_;
 
   /**
-   * @brief Count application ready for PTU
+   * @brief Applications pending count ready for PTU
    */
-  uint32_t count_application_;
+  uint32_t applications_pending_ptu_count_;
 
   /**
    * @brief Lock for guarding retry sequence
diff --git a/src/components/policy/policy_external/include/policy/status.h b/src/components/policy/policy_external/include/policy/status.h
index 0b5fb0a094..6dcc84001b 100644
--- a/src/components/policy/policy_external/include/policy/status.h
+++ b/src/components/policy/policy_external/include/policy/status.h
@@ -56,7 +56,7 @@ enum UpdateEvent {
   kScheduleManualUpdate,
   kOnResetRetrySequence,
   kNoEvent,
-  kPostponedUpdate
+  kUpdateForNextInQueue
 };
 
 const std::string kUpToDate = "UP_TO_DATE";
diff --git a/src/components/policy/policy_external/include/policy/update_status_manager.h b/src/components/policy/policy_external/include/policy/update_status_manager.h
index 57ea107103..2ca19a4d67 100644
--- a/src/components/policy/policy_external/include/policy/update_status_manager.h
+++ b/src/components/policy/policy_external/include/policy/update_status_manager.h
@@ -92,9 +92,10 @@ class UpdateStatusManager {
   void OnUpdateTimeoutOccurs();
 
   /**
-   * @brief Postponed update for PTU
+   * @brief Update status for next in queue application
+   * after previous update been has finished
    */
-  void OnUpdatePostponed();
+  void OnUpdateForNextInQueue();
 
   /**
    * @brief Update status handler for valid PTU receiving
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index 773852c354..9619872eb4 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -212,7 +212,7 @@ PolicyManagerImpl::PolicyManagerImpl()
           new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(60)
     , retry_sequence_index_(0)
-    , count_application_(0)
+    , applications_pending_ptu_count_(0)
     , ignition_check(true)
     , retry_sequence_url_(0, 0, "")
     , ptu_requested_(false)
@@ -226,7 +226,7 @@ PolicyManagerImpl::PolicyManagerImpl(bool in_memory)
           new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(60)
     , retry_sequence_index_(0)
-    , count_application_(0)
+    , applications_pending_ptu_count_(0)
     , ignition_check(true)
     , retry_sequence_url_(0, 0, "")
     , send_on_update_sent_out_(false)
@@ -557,7 +557,7 @@ void PolicyManagerImpl::OnPTUFinished(const PtProcessingResult ptu_result) {
   update_status_manager_.OnValidUpdateReceived();
 
   if (HasApplicationForPTU()) {
-    update_status_manager_.OnUpdatePostponed();
+    update_status_manager_.OnUpdateForNextInQueue();
   }
 
   if (PtProcessingResult::kNewPtRequired == ptu_result) {
@@ -779,7 +779,7 @@ void PolicyManagerImpl::OnAppsSearchCompleted(const bool trigger_ptu) {
 }
 
 void PolicyManagerImpl::OnChangeApplicationCount(const uint32_t new_app_count) {
-  count_application_ = new_app_count;
+  applications_pending_ptu_count_ = new_app_count;
 }
 
 const std::vector<std::string> PolicyManagerImpl::GetAppRequestTypes(
@@ -1397,7 +1397,7 @@ void PolicyManagerImpl::RetrySequenceFailed() {
   ResetRetrySequence(ResetRetryCountType::kResetWithStatusUpdate);
 
   if (HasApplicationForPTU()) {
-    update_status_manager_.OnUpdatePostponed();
+    update_status_manager_.OnUpdateForNextInQueue();
     StartPTExchange();
   }
   is_ptu_in_progress_ = false;
@@ -1664,8 +1664,8 @@ bool PolicyManagerImpl::IsPTValid(
   return true;
 }
 
-bool PolicyManagerImpl::HasApplicationForPTU() {
-  return count_application_ > 0;
+bool PolicyManagerImpl::HasApplicationForPTU() const {
+  return applications_pending_ptu_count_ > 0;
 }
 
 const PolicySettings& PolicyManagerImpl::get_settings() const {
diff --git a/src/components/policy/policy_external/src/status.cc b/src/components/policy/policy_external/src/status.cc
index d5e294ccf4..33fce6f8c8 100644
--- a/src/components/policy/policy_external/src/status.cc
+++ b/src/components/policy/policy_external/src/status.cc
@@ -39,7 +39,7 @@ policy::UpToDateStatus::UpToDateStatus()
 void policy::UpToDateStatus::ProcessEvent(UpdateStatusManager* manager,
                                           policy::UpdateEvent event) {
   switch (event) {
-    case kPostponedUpdate:
+    case kUpdateForNextInQueue:
       manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kOnNewAppRegistered:
@@ -60,7 +60,7 @@ policy::UpdateNeededStatus::UpdateNeededStatus()
 void policy::UpdateNeededStatus::ProcessEvent(
     policy::UpdateStatusManager* manager, policy::UpdateEvent event) {
   switch (event) {
-    case kPostponedUpdate:
+    case kUpdateForNextInQueue:
       manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kOnUpdateSentOut:
diff --git a/src/components/policy/policy_external/src/update_status_manager.cc b/src/components/policy/policy_external/src/update_status_manager.cc
index 9176afe611..fc6e93f3b7 100644
--- a/src/components/policy/policy_external/src/update_status_manager.cc
+++ b/src/components/policy/policy_external/src/update_status_manager.cc
@@ -87,9 +87,9 @@ void UpdateStatusManager::OnUpdateSentOut(uint32_t update_timeout) {
   ProcessEvent(kOnUpdateSentOut);
 }
 
-void UpdateStatusManager::OnUpdatePostponed() {
+void UpdateStatusManager::OnUpdateForNextInQueue() {
   LOG4CXX_AUTO_TRACE(logger_);
-  ProcessEvent(kPostponedUpdate);
+  ProcessEvent(kUpdateForNextInQueue);
 }
 
 void UpdateStatusManager::OnUpdateTimeoutOccurs() {
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 5b90a32ae7..b673fad7c3 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
@@ -625,7 +625,7 @@ class PolicyManagerImpl : public PolicyManager {
   void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
 
   /**
-   * @brief Change applicatios count ready for PTU
+   * @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;
@@ -1055,9 +1055,9 @@ class PolicyManagerImpl : public PolicyManager {
   void OnPTUIterationTimeout();
 
   /**
-   * @brief Check that application for PTU more than zero
+   * @brief Check that new applications for PTU were registered
    */
-  bool HasApplicationForPTU();
+  bool HasApplicationForPTU() const;
 
  private:
   /**
@@ -1157,9 +1157,9 @@ class PolicyManagerImpl : public PolicyManager {
   uint32_t retry_sequence_index_;
 
   /**
-   * @brief Count application ready for PTU
+   * @brief Applications pending count ready for PTU
    */
-  uint32_t count_application_;
+  uint32_t applications_pending_ptu_count_;
 
   /**
    * @brief Lock for guarding retry sequence
@@ -1213,7 +1213,7 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Last registered application id on mobile
    */
-  std::string last_registered_app_id_;
+  std::string last_registered_policy_app_id_;
 
   typedef std::list<std::pair<std::string, AppPoliciesValueType> >
       PendingAppPolicyActionsList;
diff --git a/src/components/policy/policy_regular/include/policy/status.h b/src/components/policy/policy_regular/include/policy/status.h
index ccc53282a8..f8f188afd9 100644
--- a/src/components/policy/policy_regular/include/policy/status.h
+++ b/src/components/policy/policy_regular/include/policy/status.h
@@ -55,7 +55,7 @@ enum UpdateEvent {
   kScheduleManualUpdate,
   kOnResetRetrySequence,
   kNoEvent,
-  kPostponedUpdate
+  kUpdateForNextInQueue
 };
 
 const std::string kUpToDate = "UP_TO_DATE";
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 1dc6b5c32c..ddff7b7cca 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -70,7 +70,7 @@ PolicyManagerImpl::PolicyManagerImpl()
           new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(kDefaultRetryTimeoutInMSec)
     , retry_sequence_index_(0)
-    , count_application_(0)
+    , applications_pending_ptu_count_(0)
     , timer_retry_sequence_(
           "Retry sequence timer",
           new timer::TimerTaskImpl<PolicyManagerImpl>(
@@ -80,7 +80,7 @@ PolicyManagerImpl::PolicyManagerImpl()
     , send_on_update_sent_out_(false)
     , trigger_ptu_(false)
     , ptu_requested_(false)
-    , last_registered_app_id_("") {}
+    , last_registered_policy_app_id_("") {}
 
 void PolicyManagerImpl::set_listener(PolicyListener* listener) {
   listener_ = listener;
@@ -686,14 +686,15 @@ void PolicyManagerImpl::OnAppsSearchCompleted(const bool trigger_ptu) {
 }
 
 void PolicyManagerImpl::OnChangeApplicationCount(const uint32_t new_app_count) {
-  count_application_ = new_app_count;
+  LOG4CXX_AUTO_TRACE(logger_);
+  applications_pending_ptu_count_ = new_app_count;
 }
 
 void PolicyManagerImpl::OnAppRegisteredOnMobile(
     const std::string& device_id, const std::string& application_id) {
-  if (last_registered_app_id_ != application_id) {
+  if (last_registered_policy_app_id_ != application_id) {
     StartPTExchange();
-    last_registered_app_id_ = application_id;
+    last_registered_policy_app_id_ = application_id;
   }
 
   SendNotificationOnPermissionsUpdated(device_id, application_id);
@@ -1671,8 +1672,8 @@ void PolicyManagerImpl::OnPTUIterationTimeout() {
   timer_retry_sequence_.Start(timeout_msec, timer::kPeriodic);
 }
 
-bool PolicyManagerImpl::HasApplicationForPTU() {
-  return count_application_ > 0;
+bool PolicyManagerImpl::HasApplicationForPTU() const {
+  return applications_pending_ptu_count_ > 0;
 }
 
 void PolicyManagerImpl::SetDefaultHmiTypes(
diff --git a/src/components/policy/policy_regular/src/status.cc b/src/components/policy/policy_regular/src/status.cc
index cad403e249..5607fc1a79 100644
--- a/src/components/policy/policy_regular/src/status.cc
+++ b/src/components/policy/policy_regular/src/status.cc
@@ -57,7 +57,7 @@ policy::UpdateNeededStatus::UpdateNeededStatus()
 void policy::UpdateNeededStatus::ProcessEvent(
     policy::UpdateStatusManagerInterface* manager, policy::UpdateEvent event) {
   switch (event) {
-    case kPostponedUpdate:
+    case kUpdateForNextInQueue:
       manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kOnUpdateSentOut:
diff --git a/src/components/policy/policy_regular/src/update_status_manager.cc b/src/components/policy/policy_regular/src/update_status_manager.cc
index 7e5b866dfa..6ca5318f96 100644
--- a/src/components/policy/policy_regular/src/update_status_manager.cc
+++ b/src/components/policy/policy_regular/src/update_status_manager.cc
@@ -120,7 +120,7 @@ void UpdateStatusManager::OnNewApplicationAdded(const DeviceConsent consent) {
   app_registered_from_non_consented_device_ = false;
   if (last_update_was_failed_) {
     last_update_was_failed_ = false;
-    ProcessEvent(kPostponedUpdate);
+    ProcessEvent(kUpdateForNextInQueue);
   }
   ProcessEvent(kOnNewAppRegistered);
 }