Merge branch 'master' into 'master'

fixing build brake

See merge request entgra/carbon-device-mgt-plugins!1

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

@@ -33,6 +33,7 @@ import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
@@ -389,6 +390,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return TestUtils.getActivity();
     }
 
+    @Override
+    public void addPolicyOperations(String s, Policy policy, List<DeviceIdentifier> list) throws OperationManagementException, InvalidDeviceException {
+
+    }
+
     @Override
     public List<? extends Operation> getOperations(DeviceIdentifier deviceIdentifier)
             throws OperationManagementException {

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

@@ -33,6 +33,7 @@ import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
@@ -389,6 +390,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return TestUtils.getActivity();
     }
 
+    @Override
+    public void addPolicyOperations(String s, Policy policy, List<DeviceIdentifier> list) throws OperationManagementException, InvalidDeviceException {
+
+    }
+
     @Override
     public List<? extends Operation> getOperations(DeviceIdentifier deviceIdentifier)
             throws OperationManagementException {