Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -82,8 +82,13 @@ public class OperationManagerImpl implements OperationManager {
             }
         }
         try {
-            List<DeviceIdentifier> authorizedDeviceList = DeviceManagementDataHolder.getInstance().
-                    getDeviceAccessAuthorizationService().isUserAuthorized(deviceIds).getAuthorizedDevices();
+            List<DeviceIdentifier> authorizedDeviceList;
+            if (operation != null && PolicyOperation.POLICY_OPERATION_CODE.equals(operation.getCode())) {
+                authorizedDeviceList = deviceIds;
+            } else {
+                authorizedDeviceList = DeviceManagementDataHolder.getInstance().
+                        getDeviceAccessAuthorizationService().isUserAuthorized(deviceIds).getAuthorizedDevices();
+            }
             if (authorizedDeviceList.size() > 0) {
                 try {
                     int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();