diff --git a/private/compat/28.0/28.0.cil b/private/compat/28.0/28.0.cil index 4e653b20a0c1cc00e895037201b56d97abe6b4ff..f7a0c375642948d20a3adc85b8a7714ca755a8d3 100644 --- a/private/compat/28.0/28.0.cil +++ b/private/compat/28.0/28.0.cil @@ -2,6 +2,7 @@ (type audio_seq_device) (type audio_timer_device) (type commontime_management_service) +(type cpuctl_device) (type fingerprint_vendor_data_file) (type full_device) (type i2c_device) diff --git a/private/file_contexts b/private/file_contexts index 32e56e0a7f3afa8e71e2f97b871653c234d85f31..dd957a74ec07df5323c976e0eb165a8d49602a58 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -83,8 +83,6 @@ /dev/block/zram[0-9]* u:object_r:ram_device:s0 /dev/bus/usb(.*)? u:object_r:usb_device:s0 /dev/console u:object_r:console_device:s0 -/dev/cpuctl(/.*)? u:object_r:cpuctl_device:s0 -/dev/memcg(/.*)? u:object_r:cgroup:s0 /dev/device-mapper u:object_r:dm_device:s0 /dev/eac u:object_r:audio_device:s0 /dev/event-log-tags u:object_r:runtime_event_log_tags_file:s0 diff --git a/public/device.te b/public/device.te index a4f7f01fe82400a1ed5e10f4cfb8e705d96ddbeb..e55c86d87529d4ad3508e0060a3da9c4e03abea4 100644 --- a/public/device.te +++ b/public/device.te @@ -18,7 +18,6 @@ type ram_device, dev_type; type rtc_device, dev_type; type vold_device, dev_type; type console_device, dev_type; -type cpuctl_device, dev_type; type fscklogs, dev_type; # GPU (used by most UI apps) type gpu_device, dev_type, mlstrustedobject; diff --git a/public/init.te b/public/init.te index 770922a1b9e52cecf51a83c9a100853eeac10ec8..2a8036a8b5fafc8972ca0b94d3b27ec3dd69d02a 100644 --- a/public/init.te +++ b/public/init.te @@ -94,7 +94,6 @@ allow init tmpfs:dir create_dir_perms; allow init tmpfs:dir mounton; allow init cgroup:dir create_dir_perms; allow init cgroup:file rw_file_perms; -allow init cpuctl_device:dir { create mounton }; # /config allow init configfs:dir mounton; diff --git a/public/postinstall_dexopt.te b/public/postinstall_dexopt.te index 8b6d6cc173c0dd93ffc1791ab9e1af98ffd5f36e..0ccd168099a40016116ff327b2bdcd0072384b0c 100644 --- a/public/postinstall_dexopt.te +++ b/public/postinstall_dexopt.te @@ -55,5 +55,3 @@ allow postinstall_dexopt postinstall:process sigchld; # Allow otapreopt to use file descriptors from otapreopt_chroot. # TODO: Probably we can actually close file descriptors... allow postinstall_dexopt otapreopt_chroot:fd use; - -allow postinstall_dexopt cpuctl_device:dir search;