From 3505cc8abcdd8dd51a32dbdf25f44efcd0296f11 Mon Sep 17 00:00:00 2001 From: lakshani Date: Mon, 20 Feb 2017 14:01:56 +0530 Subject: [PATCH 1/2] Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu' --- .../appmgt/mdm/restconnector/internal/MDMComponent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/internal/MDMComponent.java b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/internal/MDMComponent.java index c17322b79..2c1e6b2f1 100644 --- a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/internal/MDMComponent.java +++ b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/internal/MDMComponent.java @@ -40,7 +40,7 @@ public class MDMComponent { mdmServiceRegistration = bundleContext.registerService(ApplicationOperations.class.getName(), new ApplicationOperationsImpl(), null); if (log.isDebugEnabled()) { - log.debug("WSO2MDM MDM Component activated"); + log.debug("WSO2MDM MDM Component activated."); } } @@ -53,4 +53,4 @@ public class MDMComponent { log.debug("WSO2MDM MDM Component deactivated"); } } -} \ No newline at end of file +} From 5ad6dc1f1daff980c4453fd190b667bc12fc9df8 Mon Sep 17 00:00:00 2001 From: susinda Date: Fri, 24 Feb 2017 16:10:02 +0530 Subject: [PATCH 2/2] Fxing PhoneNumber Serach for android --- .../wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java index 65b7c60b9..289bfea8a 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java @@ -471,6 +471,8 @@ public class AndroidAPIUtils { getProperty(prop.getValue(), "PASSCODE_ENABLED")); deviceInfo.getDeviceDetailsMap().put("operator", getProperty(prop.getValue(), "OPERATOR")); + deviceInfo.getDeviceDetailsMap().put("PhoneNumber", + getProperty(prop.getValue(), "PHONE_NUMBER")); } } }