From adaadff7f360b27ab4c208b140eb4ea97bbf4ea1 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Tue, 23 Jan 2018 14:46:17 +0530
Subject: [PATCH] Fixing the initial configuration issue

Fixing the https://github.com/wso2/product-iots/issues/1425, Initial configurations are wrongly put on the device type xml files
---
 .../src/main/resources/devicetypes/android.xml       |  2 --
 .../src/main/resources/devicetypes/windows.xml       | 12 ++----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index e3f502bd9..b46fd8cec 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -364,11 +364,9 @@
     </TaskConfiguration>
 	<PolicyMonitoring enabled="true"/>
     <InitialOperationConfig>
-        <Operations>
             <Operation>DEVICE_INFO</Operation>
             <Operation>APPLICATION_LIST</Operation>
             <Operation>DEVICE_LOCATION</Operation>
-        </Operations>
     </InitialOperationConfig>
     <!--This configures the Task service for the android device-type. Given below are the property definitions.
         <RequireStatusMonitoring> - This will enable or disable status monitoring for that particular device-type.
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
index 7ccd06a96..7f8b69495 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
@@ -165,16 +165,8 @@
 
 	<PolicyMonitoring enabled="true"/>
     <InitialOperationConfig>
-        <Operations>
-            <Operation>
-                <Name>DEVICE_INFO</Name>
-                <RecurrentTimes>1</RecurrentTimes>
-            </Operation>
-            <Operation>
-                <Name>DEVICE_LOCATION</Name>
-                <RecurrentTimes>1</RecurrentTimes>
-            </Operation>
-        </Operations>
+        <Operation>DEVICE_INFO</Operation>
+        <Operation>DEVICE_LOCATION</Operation>
     </InitialOperationConfig>
     <DeviceStatusTaskConfig>
         <RequireStatusMonitoring>true</RequireStatusMonitoring>