Merge pull request #425 from geethkokila/master

Fixing the app manager issue by calling the correct getDevices method

components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java

@@ -233,7 +233,8 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
 			List<org.wso2.carbon.device.mgt.common.Device> deviceList = MDMServiceAPIUtils
 					.getDeviceManagementService(applicationOperationDevice.getTenantId()).
 							getDevicesOfUser(
-									applicationOperationDevice.getCurrentUser().getUsername());
+									applicationOperationDevice.getCurrentUser().getUsername(),
+									applicationOperationDevice.getPlatform());
 			devices = new ArrayList<>(deviceList.size());
 			if(log.isDebugEnabled()){
 				log.debug("device list got from mdm "+ deviceList.toString());

pom.xml

@@ -1202,7 +1202,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>1.2.6</carbon.devicemgt.version>
+        <carbon.devicemgt.version>1.2.7-SNAPSHOT</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[1.1.1, 2.0.0)</carbon.devicemgt.version.range>