From a07d6769366fb40b354b6c0dc964c61c3dce4e93 Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Tue, 20 Jun 2017 16:54:50 +0530
Subject: [PATCH 1/4] Increased timeouts for device status task.

---
 .../src/main/resources/devicetypes/android.xml            | 8 ++++----
 .../src/main/resources/devicetypes/windows.xml            | 4 ++--
 2 files changed, 6 insertions(+), 6 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 961aa1c9b4..ed43a79112 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
@@ -369,15 +369,15 @@
         <Frequency> - The time interval (in seconds) in which the task should run for this device-type
         <IdleTimeToMarkInactive> - The time duration (in seconds) in which the device can be moved to inactive status
                                    which means the device will be moved to inactive status if that device does not
-                                   contact the server within that time period.
+                                   contact the server within that time period. Better to have a multiplier of Frequency.
         <IdleTimeToMarkUnreachable> - The time duration (in seconds) in which the device can be moved to unreachable status
                                       which means the device will be moved to unreachable status if that device does not
-                                      contact the server within that time period.
+                                      contact the server within that time period. Better to have a multiplier of Frequency.
     -->
     <DeviceStatusTaskConfig>
         <RequireStatusMonitoring>true</RequireStatusMonitoring>
         <Frequency>300</Frequency>
-        <IdleTimeToMarkInactive>600</IdleTimeToMarkInactive>
-        <IdleTimeToMarkUnreachable>300</IdleTimeToMarkUnreachable>
+        <IdleTimeToMarkInactive>900</IdleTimeToMarkInactive>
+        <IdleTimeToMarkUnreachable>600</IdleTimeToMarkUnreachable>
     </DeviceStatusTaskConfig>
 </DeviceTypeConfiguration>
\ No newline at end of file
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 420c804953..7ccd06a967 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
@@ -179,7 +179,7 @@
     <DeviceStatusTaskConfig>
         <RequireStatusMonitoring>true</RequireStatusMonitoring>
         <Frequency>300</Frequency>
-        <IdleTimeToMarkInactive>600</IdleTimeToMarkInactive>
-        <IdleTimeToMarkUnreachable>300</IdleTimeToMarkUnreachable>
+        <IdleTimeToMarkInactive>900</IdleTimeToMarkInactive>
+        <IdleTimeToMarkUnreachable>600</IdleTimeToMarkUnreachable>
     </DeviceStatusTaskConfig>
 </DeviceTypeConfiguration>

From 1146acbb15d6616e34f97c95968cb7180a3445f5 Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Tue, 20 Jun 2017 19:22:52 +0530
Subject: [PATCH 2/4] Updated device-mgt-core version.

---
 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 85de7a9ce4..20fade9974 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1146,10 +1146,7 @@
         <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->
-        <carbon.appmgt.version>1.2.25</carbon.appmgt.version>
-
-        <!-- Carbon Device Management Plugins -->
-        <carbon.devicemgt.plugins.version>4.0.5-SNAPSHOT</carbon.devicemgt.plugins.version>
+        <carbon.appmgt.version>1.2.27</carbon.appmgt.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>

From 1ee97d7f933e8610d07d586a5a7c2c2f8ae38578 Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Tue, 20 Jun 2017 19:25:30 +0530
Subject: [PATCH 3/4] Updated device-mgt-core version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 20fade9974..3391724400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1142,7 +1142,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.0.3</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.0.6</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->

From 950f0fd952817404dfb679479f701bf475a5445d Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Tue, 20 Jun 2017 19:38:38 +0530
Subject: [PATCH 4/4] Fixed missing maven property issue.

---
 pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3391724400..f1bf59f9f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1146,7 +1146,10 @@
         <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->
-        <carbon.appmgt.version>1.2.27</carbon.appmgt.version>
+        <carbon.appmgt.version>1.2.25</carbon.appmgt.version>
+
+        <!-- Carbon Device Management Plugins -->
+        <carbon.devicemgt.plugins.version>4.0.4</carbon.devicemgt.plugins.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>