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

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java

@@ -429,7 +429,9 @@ public interface PolicyManagementService {
                     " the policy enforcement criteria . In a situation where you need to make changes to existing" +
                     " policies (removing, activating, deactivating and updating) or add new policies, the existing" +
                     " devices will not receive these changes immediately. Once all the required changes are made" +
-                    " you need to apply the changes to push the policy changes to the existing devices.")
+                    " you need to apply the changes to push the policy changes to the existing devices.",
+            tags = "Device Policy Management"
+    )
     @ApiResponses(
             value = {
             @ApiResponse(

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -322,6 +322,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     }
 
     @GET
+    @Path("/types")
     @Override
     public Response getDeviceTypes() {
         List<DeviceType> deviceTypes;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml

@@ -589,13 +589,13 @@
     </Permission>
     <Permission>
         <name>Deactivate Policy</name>
-        <path>/device-mgt/user/policies/add</path>
+        <path>/device-mgt/admin/policies/add</path>
         <url>/policies/deactivate-policy</url>
         <method>PUT</method>
     </Permission>
     <Permission>
         <name>Remove Policy</name>
-        <path>/device-mgt/user/policies/remove</path>
+        <path>/device-mgt/admin/policies/remove</path>
         <url>/policies/remove-policy</url>
         <method>POST</method>
     </Permission>