Merge pull request #594 from susinda/3.1.0-test

Merging commits from master to 3.1.0-test

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");
         }
     }
-}
+}

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"));
                 }
             }
         }