summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2020-02-20 00:52:26 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2020-02-20 00:52:26 -0800
commit6baf1eaee6c4a5e22f00f271ed6e89cecf5b1331 (patch)
tree8e52fa0147332231be568dddf6416597c0854b44
parentacd58c268ce756ba0a8e4d4b1c0d457f2120d976 (diff)
parentc3c332059c59410a3e0e5383a9527208c561a69f (diff)
Merge "Add system-reboot handling to peripheral_manager"
-rw-r--r--generic/vendor/common/peripheral_manager.te6
-rw-r--r--generic/vendor/common/property.te1
-rw-r--r--generic/vendor/common/property_contexts1
-rw-r--r--generic/vendor/common/vendor_init.te4
4 files changed, 12 insertions, 0 deletions
diff --git a/generic/vendor/common/peripheral_manager.te b/generic/vendor/common/peripheral_manager.te
index ee25cc97..f159b623 100644
--- a/generic/vendor/common/peripheral_manager.te
+++ b/generic/vendor/common/peripheral_manager.te
@@ -40,6 +40,9 @@ binder_call(vendor_per_mgr, rild)
allow vendor_per_mgr self:capability net_bind_service;
+# allow system reboot (for subsystem requests)
+allow vendor_per_mgr self:capability sys_boot;
+
allow vendor_per_mgr firmware_file:file r_file_perms;
allow vendor_per_mgr firmware_file:dir search;
@@ -50,6 +53,9 @@ allow vendor_per_mgr ssr_device:chr_file { open read };
# Needed by libmdmdetect to get subsystem info and to check their states
allow vendor_per_mgr sysfs_data:file r_file_perms;
+# Get config property
+get_prop(vendor_per_mgr, vendor_per_mgr_prop);
+
# Set the peripheral state property
set_prop(vendor_per_mgr, vendor_per_mgr_state_prop);
diff --git a/generic/vendor/common/property.te b/generic/vendor/common/property.te
index a5ae8764..edf06302 100644
--- a/generic/vendor/common/property.te
+++ b/generic/vendor/common/property.te
@@ -37,6 +37,7 @@ type ipacm-diag_prop, property_type;
type vendor_modem_diag_prop, property_type;
type msm_irqbalance_prop, property_type;
type vendor_per_mgr_state_prop, property_type;
+type vendor_per_mgr_prop, property_type;
type vendor_dataqti_prop, property_type;
type vendor_dataqdp_prop, property_type;
type vendor_ramdump_prop, property_type;
diff --git a/generic/vendor/common/property_contexts b/generic/vendor/common/property_contexts
index 6c47b1ec..782a6ec1 100644
--- a/generic/vendor/common/property_contexts
+++ b/generic/vendor/common/property_contexts
@@ -72,6 +72,7 @@ ro.vendor.display. u:object_r:vendor_display_prop:s0
persist.vendor.display. u:object_r:vendor_display_prop:s0
vendor.gralloc. u:object_r:vendor_gralloc_prop:s0
vendor.peripheral. u:object_r:vendor_per_mgr_state_prop:s0
+ro.vendor.peripheral. u:object_r:vendor_per_mgr_prop:s0
vendor.ims. u:object_r:ims_prop:s0
ro.vendor.build.software.version u:object_r:ims_prop:s0
persist.vendor.ims. u:object_r:ims_prop:s0
diff --git a/generic/vendor/common/vendor_init.te b/generic/vendor/common/vendor_init.te
index 84e0eee0..f811f76e 100644
--- a/generic/vendor/common/vendor_init.te
+++ b/generic/vendor/common/vendor_init.te
@@ -91,6 +91,10 @@ set_prop(vendor_init, sensors_prop)
#Access vendor bluetooth properties
set_prop(vendor_init, vendor_bluetooth_prop)
+
+#Access peripheral manager config
+set_prop(vendor_init, vendor_per_mgr_prop)
+
userdebug_or_eng(`
allow vendor_init proc_security:file rw_file_perms;
')