community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #594 from susinda/3.1.0-test

Browse Source 
Merging commits from master to 3.1.0-test
This commit is contained in:
Susinda Perera 2017-02-28 20:30:49 +05:30 committed by GitHub
commit 4f5e4b2230
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/internal/MDMComponent.java
View File

@ -40,7 +40,7 @@ public class MDMComponent {
mdmServiceRegistration = bundleContext.registerService(ApplicationOperations.class.getName(), new mdmServiceRegistration = bundleContext.registerService(ApplicationOperations.class.getName(), new
ApplicationOperationsImpl(), null); ApplicationOperationsImpl(), null);
if (log.isDebugEnabled()) { 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"); log.debug("WSO2MDM MDM Component deactivated");
} }
} }
} }

2
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
View File

@ -471,6 +471,8 @@ public class AndroidAPIUtils {
getProperty(prop.getValue(), "PASSCODE_ENABLED")); getProperty(prop.getValue(), "PASSCODE_ENABLED"));
deviceInfo.getDeviceDetailsMap().put("operator", deviceInfo.getDeviceDetailsMap().put("operator",
getProperty(prop.getValue(), "OPERATOR")); getProperty(prop.getValue(), "OPERATOR"));
deviceInfo.getDeviceDetailsMap().put("PhoneNumber",
getProperty(prop.getValue(), "PHONE_NUMBER"));
} }
} }
} }