diff --git a/legacy/whitechapel_pro/file.te b/legacy/whitechapel_pro/file.te index 23d748b..f59a80b 100644 --- a/legacy/whitechapel_pro/file.te +++ b/legacy/whitechapel_pro/file.te @@ -2,8 +2,6 @@ type updated_wifi_firmware_data_file, file_type, data_file_type; type vendor_misc_data_file, file_type, data_file_type; type per_boot_file, file_type, data_file_type, core_data_file_type; -type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type; -type uwb_data_vendor, file_type, data_file_type; type powerstats_vendor_data_file, file_type, data_file_type; type sensor_debug_data_file, file_type, data_file_type; @@ -19,7 +17,6 @@ type vendor_regmap_debugfs, fs_type, debugfs_type; # persist type persist_ss_file, file_type, vendor_persist_type; -type persist_uwb_file, file_type, vendor_persist_type; # Storage Health HAL type proc_f2fs, proc_type, fs_type; diff --git a/legacy/whitechapel_pro/file_contexts b/legacy/whitechapel_pro/file_contexts index a9901c0..50db736 100644 --- a/legacy/whitechapel_pro/file_contexts +++ b/legacy/whitechapel_pro/file_contexts @@ -41,13 +41,11 @@ /data/vendor/misc(/.*)? u:object_r:vendor_misc_data_file:s0 /data/per_boot(/.*)? u:object_r:per_boot_file:s0 /data/vendor/sensors/registry(/.*)? u:object_r:sensor_reg_data_file:s0 -/data/vendor/uwb(/.*)? u:object_r:uwb_data_vendor:s0 /dev/battery_history u:object_r:battery_history_device:s0 /data/vendor/powerstats(/.*)? u:object_r:powerstats_vendor_data_file:s0 # Persist /mnt/vendor/persist/sensors/registry(/.*)? u:object_r:persist_sensor_reg_file:s0 -/mnt/vendor/persist/uwb(/.*)? u:object_r:persist_uwb_file:s0 # Raw HID device /dev/hidraw[0-9]* u:object_r:hidraw_device:s0 diff --git a/legacy/zuma/vendor/file_contexts b/legacy/zuma/vendor/file_contexts index 50be206..dad7d26 100644 --- a/legacy/zuma/vendor/file_contexts +++ b/legacy/zuma/vendor/file_contexts @@ -7,7 +7,6 @@ /vendor/bin/hw/android\.hardware\.usb\.gadget-service u:object_r:hal_usb_gadget_impl_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element@1\.2-uicc-service u:object_r:hal_secure_element_uicc_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element-service.uicc u:object_r:hal_secure_element_uicc_exec:s0 -/vendor/bin/hw/android\.hardware\.qorvo\.uwb\.service u:object_r:hal_uwb_vendor_default_exec:s0 /vendor/bin/hw/android\.hardware\.composer\.hwc3-service\.pixel u:object_r:hal_graphics_composer_default_exec:s0 /vendor/bin/hw/android\.hardware\.contexthub-service\.generic u:object_r:hal_contexthub_default_exec:s0 /vendor/bin/hw/google\.hardware\.media\.c2@2\.0-service u:object_r:mediacodec_google_exec:s0 @@ -20,7 +19,6 @@ /vendor/bin/trusty_apploader u:object_r:trusty_apploader_exec:s0 /vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0 /vendor/bin/chre u:object_r:chre_exec:s0 -/vendor/bin/init\.uwb\.calib\.sh u:object_r:vendor_uwb_init_exec:s0 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty u:object_r:hal_keymint_default_exec:s0 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trusty u:object_r:hal_keymint_default_exec:s0 /vendor/bin/ufs_firmware_update\.sh u:object_r:ufs_firmware_update_exec:s0 diff --git a/vendor/file.te b/vendor/file.te index eff5cbf..5581e3e 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -1,3 +1,10 @@ +# persist +type persist_uwb_file, file_type, vendor_persist_type; + #sysfs type sysfs_pca, sysfs_type, fs_type; +# Data +type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type; +type uwb_data_vendor, file_type, data_file_type; + diff --git a/vendor/file_contexts b/vendor/file_contexts index 416bd61..225f3a5 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -1,3 +1,13 @@ +# Binaries +/vendor/bin/hw/android\.hardware\.qorvo\.uwb\.service u:object_r:hal_uwb_vendor_default_exec:s0 +/vendor/bin/init_uwb_calib u:object_r:vendor_uwb_init_exec:s0 + +# Vendor +/data/vendor/uwb(/.*)? u:object_r:uwb_data_vendor:s0 + +# persist +/mnt/vendor/persist/uwb(/.*)? u:object_r:persist_uwb_file:s0 + # Devices /dev/logbuffer_maxfg_base u:object_r:logbuffer_device:s0 /dev/logbuffer_maxfg_secondary u:object_r:logbuffer_device:s0 diff --git a/legacy/zuma/vendor/hal_uwb_vendor_default.te b/vendor/hal_uwb_vendor_default.te similarity index 63% rename from legacy/zuma/vendor/hal_uwb_vendor_default.te rename to vendor/hal_uwb_vendor_default.te index 06a67d0..e6ac638 100644 --- a/legacy/zuma/vendor/hal_uwb_vendor_default.te +++ b/vendor/hal_uwb_vendor_default.te @@ -3,3 +3,6 @@ type hal_uwb_vendor_default_exec, vendor_file_type, exec_type, file_type; allow hal_uwb_default uci_device:chr_file rw_file_perms; init_daemon_domain(hal_uwb_vendor_default) +allow hal_uwb_default uwb_data_vendor:dir create_dir_perms; +allow hal_uwb_default uwb_data_vendor:file create_file_perms; + diff --git a/legacy/zuma/vendor/vendor_uwb_init.te b/vendor/vendor_uwb_init.te similarity index 52% rename from legacy/zuma/vendor/vendor_uwb_init.te rename to vendor/vendor_uwb_init.te index 5216019..84e41cf 100644 --- a/legacy/zuma/vendor/vendor_uwb_init.te +++ b/vendor/vendor_uwb_init.te @@ -2,3 +2,7 @@ type vendor_uwb_init, domain; type vendor_uwb_init_exec, exec_type, vendor_file_type, file_type; init_daemon_domain(vendor_uwb_init) + +allow vendor_uwb_init uwb_data_vendor:file create_file_perms; +allow vendor_uwb_init uwb_data_vendor:dir w_dir_perms; +