From 2bdaf4186b5319885dc6861a5be48f319ba81caf Mon Sep 17 00:00:00 2001
From: charitha <charitha@entgra.io>
Date: Wed, 6 Jan 2021 16:18:35 +0530
Subject: [PATCH] Add Activity ID for repeated operation

---
 .../device/mgt/core/operation/mgt/OperationManagerImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
index 57ddf9674d..3ebbc1e04d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
@@ -229,6 +229,8 @@ public class OperationManagerImpl implements OperationManager {
                                     + operationCode);
                         }
                         Activity activity = new Activity();
+                        activity.setActivityId(DeviceManagementConstants.OperationAttributes.ACTIVITY +
+                                operation.getId());
                         activity.setActivityStatus(
                                 this.getActivityStatus(deviceValidationResult, deviceAuthorizationResult));
                         return activity;