community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts for traccar

Browse Source
This commit is contained in:
Rushdi 2022-05-30 17:33:38 +05:30
parent ff615bf81d
commit a28952dc80
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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
View File

@ -140,6 +140,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null; return null;
} }
@Override
public PaginationResult getAllDevicesIds(PaginationRequest paginationRequest) throws DeviceManagementException {
return null;
}
@Override @Override
public PaginationResult getAllDevices(PaginationRequest paginationRequest, boolean b) public PaginationResult getAllDevices(PaginationRequest paginationRequest, boolean b)
throws DeviceManagementException { throws DeviceManagementException {
@ -156,6 +161,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null; return null;
} }
@Override
public PaginationResult getAllDevicesIdList(PaginationRequest paginationRequest) throws DeviceManagementException {
return null;
}
@Override @Override
public Device getDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException { public Device getDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException {
if (TestUtils.getDeviceId().equals(deviceIdentifier.getId())) { if (TestUtils.getDeviceId().equals(deviceIdentifier.getId())) {