fixing Android API util related issues

revert-70aa11f8
prabathabey 10 years ago
parent 441a135acb
commit ab6c2717c9

@ -150,6 +150,11 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<cxf.version>2.6.1</cxf.version> <cxf.version>2.6.1</cxf.version>

@ -17,9 +17,8 @@
package cdm.api.android.util; package cdm.api.android.util;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import org.wso2.carbon.device.mgt.core.dto.Device; import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.mobile.impl.MobileDeviceManagementConstants;
/** /**
* AndroidAPIUtil class provides utility function used by Android REST-API classes. * AndroidAPIUtil class provides utility function used by Android REST-API classes.
@ -35,7 +34,7 @@ public class AndroidAPIUtil {
Device device = new Device(); Device device = new Device();
DeviceType type = new DeviceType(); DeviceType type = new DeviceType();
device.setId(deviceId); device.setId(deviceId);
type.setName(MobileDeviceManagementConstants.MOBILE_DEVICE_TYPE_ANDROID); type.setName(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
device.setDeviceType(type); device.setDeviceType(type);
return device; return device;
} }

Loading…
Cancel
Save