diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
index f7f08b3a50..40bbfbb033 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
@@ -40,6 +40,7 @@ import org.wso2.carbon.mdm.services.android.utils.TestUtils;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class DeviceManagementProviderServiceMock implements DeviceManagementProviderService {
     @Override
@@ -141,6 +142,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override
+    public List<Device> getDevicesBasedOnProperties(Map map) throws DeviceManagementException {
+        return null;
+    }
+
     @Override
     public Device getDevice(String s, Date date, boolean b) throws DeviceManagementException {
         if (TestUtils.getDeviceId().equals(s)) {
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
index f7f08b3a50..40bbfbb033 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
@@ -40,6 +40,7 @@ import org.wso2.carbon.mdm.services.android.utils.TestUtils;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class DeviceManagementProviderServiceMock implements DeviceManagementProviderService {
     @Override
@@ -141,6 +142,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override
+    public List<Device> getDevicesBasedOnProperties(Map map) throws DeviceManagementException {
+        return null;
+    }
+
     @Override
     public Device getDevice(String s, Date date, boolean b) throws DeviceManagementException {
         if (TestUtils.getDeviceId().equals(s)) {