From f1607f868db14a42348fc01c7f19c36ccfe68f92 Mon Sep 17 00:00:00 2001
From: charitha <charithag@wso2.com>
Date: Wed, 19 Sep 2018 13:46:05 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/wso2/carbon-device-mgt-plugins into entgra-master

# Conflicts:
#	pom.xml
---
 .../mocks/DeviceManagementProviderServiceMock.java     | 10 ++++++++++
 .../mocks/DeviceManagementProviderServiceMock.java     | 10 ++++++++++
 2 files changed, 20 insertions(+)

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 0129f6f0fc..f00fe8a2a8 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
@@ -471,11 +471,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return 0;
     }
 
+    @Override
+    public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
         return 0;
     }
 
+    @Override
+    public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
+        return 0;
+    }
+
     @Override
     public List<MonitoringOperation> getMonitoringOperationList(String s) {
         return null;
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 0129f6f0fc..f00fe8a2a8 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
@@ -471,11 +471,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return 0;
     }
 
+    @Override
+    public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
         return 0;
     }
 
+    @Override
+    public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
+        return 0;
+    }
+
     @Override
     public List<MonitoringOperation> getMonitoringOperationList(String s) {
         return null;