diff options
| author | Maksym Ked (GitHub) <41471947+mked-luxoft@users.noreply.github.com> | 2020-02-20 21:12:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 14:12:32 -0500 |
| commit | 14873b942d5e876ea119cc19846a454d06007f1f (patch) | |
| tree | c40e93389629a7a05b8342178e9f39fdd2470c6f /src/components/policy/policy_external | |
| parent | b281c67f167f385aabbb232333ddc8cef65172d7 (diff) | |
| download | sdl_core-14873b942d5e876ea119cc19846a454d06007f1f.tar.gz | |
Adapt fix #3203 for PROPRIETARY flow (#3242)
* Adapt fix #3203 for PROPRIETARY flow
* fixup! Adapt fix #3203 for PROPRIETARY flow
Co-authored-by: Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com>
Diffstat (limited to 'src/components/policy/policy_external')
3 files changed, 5 insertions, 4 deletions
diff --git a/src/components/policy/policy_external/include/policy/policy_types.h b/src/components/policy/policy_external/include/policy/policy_types.h index ee2d806ba5..879eb0aa9b 100644 --- a/src/components/policy/policy_external/include/policy/policy_types.h +++ b/src/components/policy/policy_external/include/policy/policy_types.h @@ -75,7 +75,8 @@ enum PolicyTableStatus { StatusUpToDate = 0, StatusUpdatePending, StatusUpdateRequired, - StatusUnknown + StatusUnknown, + StatusProcessingSnapshot }; // Code generator uses String class name, so this typedef was renamed to PTSring diff --git a/src/components/policy/policy_external/src/status.cc b/src/components/policy/policy_external/src/status.cc index 687bea1c3f..f605a51a98 100644 --- a/src/components/policy/policy_external/src/status.cc +++ b/src/components/policy/policy_external/src/status.cc @@ -83,7 +83,8 @@ bool policy::UpdateNeededStatus::IsUpdateRequired() const { } policy::UpdatePendingStatus::UpdatePendingStatus() - : Status(kUpdateNeeded, policy::PolicyTableStatus::StatusUpdatePending) {} + : Status(kUpdateNeeded, + policy::PolicyTableStatus::StatusProcessingSnapshot) {} void policy::UpdatePendingStatus::ProcessEvent( policy::UpdateStatusManager* manager, policy::UpdateEvent event) { 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 3653983c8f..cfbd2fe32b 100644 --- a/src/components/policy/policy_external/src/update_status_manager.cc +++ b/src/components/policy/policy_external/src/update_status_manager.cc @@ -217,8 +217,7 @@ void UpdateStatusManager::DoTransition() { next_status_.reset(); const bool is_update_pending = - (policy::kUpdateNeeded == current_status_->get_status_string() && - policy::StatusUpdatePending == current_status_->get_status()); + policy::StatusProcessingSnapshot == current_status_->get_status(); if (last_processed_event_ != kScheduleManualUpdate && !is_update_pending) { listener_->OnUpdateStatusChanged(current_status_->get_status_string()); |