Merge remote-tracking branch 'origin/feature/base_app_services_implementation' into feature/app_service_policies

# Conflicts:
#	src/components/application_manager/src/app_service_manager.cc

2 files changed, 10 insertions, 0 deletions

diff --git a/src/components/policy/policy_external/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h
index 094e5cc7c6..32277f2dcf 100644
--- a/src/components/policy/policy_external/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h
@@ -546,6 +546,11 @@ enum FunctionID {
   OnAppServiceDataID = 32786,
 
   /**
+   * @brief OnSystemCapabilityUpdatedID
+   */
+  OnSystemCapabilityUpdatedID = 32787,
+
+  /**
    * @brief EncodedSyncPDataID.
    */
   EncodedSyncPDataID = 65536,
diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc
index 2260d7e320..2d21715194 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -1226,6 +1226,11 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
     return true;
   }
 
+  if ("OnSystemCapabilityUpdated" == literal) {
+    *result = OnSystemCapabilityUpdatedID;
+    return true;
+  }
+
   if ("EncodedSyncPData" == literal) {
     *result = EncodedSyncPDataID;
     return true;