Sync with core

merge-requests/153/head
Yohan Avishke 5 years ago
parent b7f6349549
commit ca9bc9e0d2

@ -15,6 +15,23 @@
* specific language governing permissions and limitations
* under the License.
*/
/*
* Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
*
* Entgra (pvt) Ltd. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.mdm.services.android.mocks;
@ -58,8 +75,9 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo;
import org.wso2.carbon.mdm.services.android.utils.TestUtils;
import org.apache.commons.collections.map.SingletonMap;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -304,7 +322,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
}
@Override
public HashMap<Integer, Device> getTenantedDevice(DeviceIdentifier deviceIdentifier)
public SingletonMap getTenantedDevice(DeviceIdentifier deviceIdentifier, boolean b)
throws DeviceManagementException {
return null;
}

Loading…
Cancel
Save