From a28952dc805f46385749931ab0b488c514b7b12f Mon Sep 17 00:00:00 2001 From: Rushdi Date: Mon, 30 May 2022 17:33:38 +0530 Subject: [PATCH] fix merge conflicts for traccar --- .../mocks/DeviceManagementProviderServiceMock.java | 10 ++++++++++ 1 file changed, 10 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 32168a7b27..7a7b9db81c 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 @@ -140,6 +140,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv return null; } + @Override + public PaginationResult getAllDevicesIds(PaginationRequest paginationRequest) throws DeviceManagementException { + return null; + } + @Override public PaginationResult getAllDevices(PaginationRequest paginationRequest, boolean b) throws DeviceManagementException { @@ -156,6 +161,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv return null; } + @Override + public PaginationResult getAllDevicesIdList(PaginationRequest paginationRequest) throws DeviceManagementException { + return null; + } + @Override public Device getDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException { if (TestUtils.getDeviceId().equals(deviceIdentifier.getId())) {