Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master

# Conflicts:
#	pom.xml
This commit is contained in:
charitha 2018-09-19 13:46:05 +05:30
parent 8865404702
commit f1607f868d
2 changed files with 20 additions and 0 deletions

View File

@ -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;

View File

@ -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;