|
|
|
@ -57,11 +57,13 @@ public class AndroidDeviceManager implements DeviceManager {
|
|
|
|
|
public AndroidDeviceManager() {
|
|
|
|
|
this.daoFactory = new AndroidDAOFactory();
|
|
|
|
|
this.licenseManager = new RegistryBasedLicenseManager();
|
|
|
|
|
License defaultLicense;
|
|
|
|
|
|
|
|
|
|
License defaultLicense = AndroidPluginUtils.getDefaultLicense();
|
|
|
|
|
try {
|
|
|
|
|
licenseManager
|
|
|
|
|
.addLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, defaultLicense);
|
|
|
|
|
if (licenseManager.getLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, "en_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);
|
|
|
|
@ -117,7 +119,7 @@ public class AndroidDeviceManager implements DeviceManager {
|
|
|
|
|
MobileDeviceManagementUtil.getPlatformConfigPath(DeviceManagementConstants.
|
|
|
|
|
MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
|
|
|
|
|
resource = MobileDeviceManagementUtil.getRegistryResource(androidRegPath);
|
|
|
|
|
if(resource != null){
|
|
|
|
|
if (resource != null) {
|
|
|
|
|
JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
|
|
|
|
|
Unmarshaller unmarshaller = context.createUnmarshaller();
|
|
|
|
|
return (TenantConfiguration) unmarshaller.unmarshal(
|
|
|
|
|