Merge pull request #824 from Megala21/master

Fixing https://github.com/wso2/product-iots/issues/1388

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementServiceImpl.java

@@ -316,15 +316,15 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     @Path("/{id}/status")
     @Override
     public Response isEnrolled(@PathParam("id") String id, @HeaderParam("If-Modified-Since") String ifModifiedSince) {
-        boolean result;
         DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id);
         try {
-            result = AndroidAPIUtils.getDeviceManagementService().isEnrolled(deviceIdentifier);
+            Device device = AndroidAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier);
-            if (result) {
+            if (device != null) {
+                String status = String.valueOf(device.getEnrolmentInfo().getStatus());
                 Message responseMessage = new Message();
                 responseMessage.setResponseCode(Response.Status.OK.toString());
-                responseMessage.setResponseMessage("Android device that carries the id '" +
+                responseMessage
-                        id + "' is enrolled");
+                        .setResponseMessage("Status of android device that carries the id '" + id + "' is " + status);
                 return Response.status(Response.Status.OK).entity(responseMessage).build();
             } else {
                 Message responseMessage = new Message();