Merge "thermal: move thermal-hal selinux policy to Pixel-wide folder" into rvc-dev am: 3f73ae5c68

Change-Id: I0783c0ae25c77ab13326ca1ea04119cdf82cd37f
This commit is contained in:
TreeHugger Robot
2020-04-06 14:57:01 +00:00
committed by Automerger Merge Worker
8 changed files with 3 additions and 26 deletions

View File

@@ -178,7 +178,6 @@
/vendor/etc/init\.insmod\.cfg u:object_r:init-insmod-sh_exec:s0
/vendor/bin/init\.power\.sh u:object_r:init_power_exec:s0
/vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0
/vendor/bin/thermal_logd u:object_r:init-thermal-logging-sh_exec:s0
/vendor/bin/ramoops u:object_r:ramoops_exec:s0
/vendor/bin/init\.ramoops\.sh u:object_r:ramoops_exec:s0
/vendor/bin/init\.fingerprint\.sh u:object_r:init-fingerprint_exec:s0
@@ -193,7 +192,6 @@
/vendor/bin/hw/android\.hardware\.keymaster@3\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0
/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service-qti u:object_r:hal_gatekeeper_qti_exec:s0
/vendor/bin/hw/android\.hardware\.gnss@1\.0-service-qti u:object_r:hal_gnss_qti_exec:s0
/vendor/bin/hw/android\.hardware\.thermal@2\.0-service\.pixel u:object_r:hal_thermal_default_exec:s0
###############################################
# same-process HAL files and their dependencies

View File

@@ -46,8 +46,6 @@ genfscon sysfs /devices/soc/soc:qcom,ipa_fws@1e08000 u:object
genfscon sysfs /devices/soc/cce0000.qcom,venus u:object_r:sysfs_msm_subsys:s0
genfscon sysfs /devices/soc/0.qcom,rmtfs_sharedmem u:object_r:sysfs_rmtfs:s0
genfscon sysfs /devices/soc/soc:fp_fpc1020 u:object_r:sysfs_fingerprint:s0
genfscon sysfs /class/thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /devices/virtual/thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /devices/virtual/wahoo_laser u:object_r:sysfs_laser:s0
genfscon sysfs /module/msm_thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /module/printk/parameters/console_suspend u:object_r:sysfs_console_suspend:s0

View File

@@ -15,4 +15,4 @@ allow hal_power_default sysfs_touch:dir search;
set_prop(hal_power_default, power_prop)
# interact with thermal_config
set_prop(hal_power_default, thermal_prop)
set_prop(hal_power_default, vendor_thermal_prop)

View File

@@ -1,7 +0,0 @@
allow hal_thermal_default sysfs_thermal:dir r_dir_perms;
allow hal_thermal_default sysfs_thermal:file r_file_perms;
allow hal_thermal_default sysfs_thermal:lnk_file read;
allow hal_thermal_default proc_stat:file r_file_perms;
# read thermal_config
get_prop(hal_thermal_default, thermal_prop)

View File

@@ -1,10 +0,0 @@
type init-thermal-logging-sh, domain;
type init-thermal-logging-sh_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(init-thermal-logging-sh)
userdebug_or_eng(`
allow init-thermal-logging-sh vendor_toolbox_exec:file rx_file_perms;
allow init-thermal-logging-sh sysfs_thermal:dir r_dir_perms;
allow init-thermal-logging-sh sysfs_thermal:file r_file_perms;
')

View File

@@ -11,7 +11,6 @@ type vendor_ssr_prop, property_type;
type cnss_diag_prop, property_type;
type tee_listener_prop, property_type;
type wc_prop, property_type;
type thermal_prop, property_type;
type modem_diag_prop, property_type;
type sys_time_prop, property_type;
type atfwd_start_prop, property_type;

View File

@@ -17,8 +17,7 @@ vendor.debug.ssrdump u:object_r:vendor_ssr_prop:s0
persist.sys.cnss. u:object_r:cnss_diag_prop:s0
sys.listeners.registered u:object_r:tee_listener_prop:s0
wc_transport. u:object_r:wc_prop:s0
vendor.qcom.thermalcfg u:object_r:thermal_prop:s0
vendor.thermal.config u:object_r:thermal_prop:s0
vendor.qcom.thermalcfg u:object_r:vendor_thermal_prop:s0
persist.sys.modem.diag. u:object_r:modem_diag_prop:s0
sys.modem.diag. u:object_r:modem_diag_prop:s0
sys.time.set u:object_r:sys_time_prop:s0

View File

@@ -25,7 +25,7 @@ set_prop(vendor_init, modem_diag_prop)
set_prop(vendor_init, power_prop)
set_prop(vendor_init, public_vendor_default_prop)
set_prop(vendor_init, vendor_radio_prop)
set_prop(vendor_init, thermal_prop)
set_prop(vendor_init, vendor_thermal_prop)
set_prop(vendor_init, vendor_charge_prop)
dontaudit vendor_init unlabeled:dir getattr;