From ab6c2717c919fb0872266ffe38ff9841dc7694c0 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 9 Dec 2014 20:32:56 +0530 Subject: [PATCH] fixing Android API util related issues --- product/modules/agents/android/jax-rs/pom.xml | 5 +++++ .../src/main/java/cdm/api/android/util/AndroidAPIUtil.java | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/product/modules/agents/android/jax-rs/pom.xml b/product/modules/agents/android/jax-rs/pom.xml index c9d0901cf6..86c77925e0 100644 --- a/product/modules/agents/android/jax-rs/pom.xml +++ b/product/modules/agents/android/jax-rs/pom.xml @@ -150,6 +150,11 @@ org.wso2.carbon org.wso2.carbon.utils + + org.wso2.carbon + org.wso2.carbon.device.mgt.common + 2.0.0-SNAPSHOT + 2.6.1 diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtil.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtil.java index 0995f27cc9..967b5784d4 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtil.java +++ b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtil.java @@ -17,9 +17,8 @@ package cdm.api.android.util; import com.google.gson.JsonObject; -import org.wso2.carbon.device.mgt.core.dto.Device; -import org.wso2.carbon.device.mgt.core.dto.DeviceType; -import org.wso2.carbon.device.mgt.mobile.impl.MobileDeviceManagementConstants; +import org.wso2.carbon.device.mgt.common.Device; +import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; /** * AndroidAPIUtil class provides utility function used by Android REST-API classes. @@ -35,7 +34,7 @@ public class AndroidAPIUtil { Device device = new Device(); DeviceType type = new DeviceType(); device.setId(deviceId); - type.setName(MobileDeviceManagementConstants.MOBILE_DEVICE_TYPE_ANDROID); + type.setName(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); device.setDeviceType(type); return device; }