From 6feed8b9e68368fa6ed01a5da8012cde4f5f1fd4 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 29 Jan 2018 16:24:36 +0530
Subject: [PATCH 1/2] Fixing regression issues

---
 .../device/mgt/mobile/android/impl/AndroidDeviceManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
index 60ff48725..63df2b80d 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
@@ -131,7 +131,7 @@ public class AndroidDeviceManager implements DeviceManager {
                             MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
             resource = MobileDeviceManagementUtil.getRegistryResource(androidRegPath);
             if (resource != null) {
-                XMLInputFactory factory = XMLInputFactory.newFactory();
+                XMLInputFactory factory = XMLInputFactory.newInstance();
                 factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
                 factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
                 XMLStreamReader reader = factory.createXMLStreamReader(

From a03a8bb674414220ffe987e57eb14833dd446614 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 29 Jan 2018 16:34:49 +0530
Subject: [PATCH 2/2] Updating devicemgt version

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

diff --git a/pom.xml b/pom.xml
index c093e2442..cd3fba7a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1215,7 +1215,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.0.216</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.0.218</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->