Merge branch 'master' into 'master'

Add Activity ID for repeated operation

See merge request entgra/carbon-device-mgt!714
revert-70ac1926
Charitha Goonetilleke 4 years ago
commit 8e6ab9d8cd

@ -229,6 +229,8 @@ public class OperationManagerImpl implements OperationManager {
+ operationCode); + operationCode);
} }
Activity activity = new Activity(); Activity activity = new Activity();
activity.setActivityId(DeviceManagementConstants.OperationAttributes.ACTIVITY +
operation.getId());
activity.setActivityStatus( activity.setActivityStatus(
this.getActivityStatus(deviceValidationResult, deviceAuthorizationResult)); this.getActivityStatus(deviceValidationResult, deviceAuthorizationResult));
return activity; return activity;

Loading…
Cancel
Save