Fix conflicts after rebasing

Conflicts after rebasing to feature/extended_policy_functionality
are fixed.

Conflicts:
	src/components/include/policy/policy_regular/policy/policy_manager.h
	src/components/policy/policy_external/src/policy_manager_impl.cc
	src/components/policy/policy_regular/include/policy/policy_manager_impl.h

1 files changed, 13 insertions, 0 deletions

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 6928133775..6028a1674e 100644
--- a/src/components/include/policy/policy_external/policy/policy_manager.h
+++ b/src/components/include/policy/policy_external/policy/policy_manager.h
@@ -488,6 +488,19 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    * urls vector
    */
   virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0;
+
+  /**
+   * @brief Checks if there is existing URL in the EndpointUrls vector with
+   * index saved in the policy manager and if not, it moves to the next
+   * application index
+   * @param rs contains the application index and url index from the
+   * urls vector that are to be sent on the next OnSystemRequest
+   * @param urls vector of vectors that contain urls for each application
+   * @return Pair of application index and url index
+   */
+  virtual AppIdURL RetrySequenceUrl(const struct RetrySequenceURL& rs,
+                                    const EndpointUrls& urls) const = 0;
+
  protected:
   /**
    * Checks is PT exceeded IgnitionCycles