Merge branch 'hasuniea-master'

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java

@@ -23,5 +23,7 @@ public class MobilePluginConstants {
 
     public static final String MEDIA_TYPE_XML = "application/xml";
     public static final String CHARSET_UTF8 = "UTF8";
+    public static final String LANGUAGE_CODE_ENGLISH_US = "en_US";
+    public static final String LANGUAGE_CODE_ENGLISH_UK = "en_UK";
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java

@@ -57,11 +57,14 @@ public class AndroidDeviceManager implements DeviceManager {
     public AndroidDeviceManager() {
         this.daoFactory = new AndroidDAOFactory();
         this.licenseManager = new RegistryBasedLicenseManager();
+        License defaultLicense;
 
-		License defaultLicense = AndroidPluginUtils.getDefaultLicense();
         try {
-			licenseManager
+            if (licenseManager.getLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID,
-					.addLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, defaultLicense);
+                    MobilePluginConstants.LANGUAGE_CODE_ENGLISH_US) == null) {
+                defaultLicense = AndroidPluginUtils.getDefaultLicense();
+                licenseManager.addLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, defaultLicense);
+            }
             featureManager.addSupportedFeaturesToDB();
         } catch (LicenseManagementException e) {
             log.error("Error occurred while adding default license for Android devices", e);

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java

@@ -61,7 +61,10 @@ public class WindowsDeviceManager implements DeviceManager {
         License defaultLicense = WindowsPluginUtils.getDefaultLicense();
 
         try {
+            if (licenseManager.getLicense(WindowsDeviceManagementService.DEVICE_TYPE_WINDOWS,
+                    MobilePluginConstants.LANGUAGE_CODE_ENGLISH_US) == null) {
                 licenseManager.addLicense(WindowsDeviceManagementService.DEVICE_TYPE_WINDOWS, defaultLicense);
+            }
             featureManager.addSupportedFeaturesToDB();
         } catch (LicenseManagementException e) {
             log.error("Error occurred while adding default license for Windows devices", e);