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 branch 'master' into jenkinsfile

Browse Source
This commit is contained in:
Kavin Prathaban 2024-09-25 11:55:24 +00:00
commit 6f51a85387
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java
View File

@ -243,6 +243,8 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
} else { } else {
inputEventAdapterListener.onEvent(msgText); inputEventAdapterListener.onEvent(msgText);
} }
} catch (Exception ex) {
log.error("Error in message arrive : ", ex);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }

4
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java
View File

@ -231,7 +231,7 @@ import java.util.List;
@Scope( @Scope(
name = "Password Policy", name = "Password Policy",
description = "Set password policy of an Android Device", description = "Set password policy of an Android Device",
key = "and:ops:password-policy", key = "and:ops:pwd-policy",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/password-policy"} permissions = {"/device-mgt/devices/owning-device/operations/android/password-policy"}
), ),
@ -1751,7 +1751,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:password-policy") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:pwd-policy")
}) })
} }
) )

2
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
View File

@ -21,7 +21,7 @@
"and:ops:mute", "and:ops:mute",
"and:ops:change-lock-code", "and:ops:change-lock-code",
"and:ops:blacklist-app", "and:ops:blacklist-app",
"and:ops:password-policy", "and:ops:pwd-policy",
"and:ops:encrypt-storage", "and:ops:encrypt-storage",
"and:ops:clear-password", "and:ops:clear-password",
"and:ops:enterprise-wipe", "and:ops:enterprise-wipe",