diff --git a/legacy/whitechapel_pro/file.te b/legacy/whitechapel_pro/file.te index 40d4d17c..dad2e39a 100644 --- a/legacy/whitechapel_pro/file.te +++ b/legacy/whitechapel_pro/file.te @@ -1,7 +1,6 @@ # Data type rild_vendor_data_file, file_type, data_file_type; type vendor_hwc_log_file, file_type, data_file_type; -type modem_stat_data_file, file_type, data_file_type; type updated_wifi_firmware_data_file, file_type, data_file_type; type tcpdump_vendor_data_file, file_type, data_file_type; type vendor_camera_data_file, file_type, data_file_type; @@ -67,9 +66,6 @@ type vendor_usf_stats, vendor_file_type, file_type; type vendor_usf_reg_edit, vendor_file_type, file_type; type vendor_dumpsys, vendor_file_type, file_type; -# Modem -type modem_userdata_file, file_type; - # SecureElement type sysfs_st33spi, sysfs_type, fs_type; typeattribute sysfs_st33spi mlstrustedobject; diff --git a/legacy/whitechapel_pro/file_contexts b/legacy/whitechapel_pro/file_contexts index d8681295..641988bc 100644 --- a/legacy/whitechapel_pro/file_contexts +++ b/legacy/whitechapel_pro/file_contexts @@ -4,7 +4,6 @@ /vendor/bin/vcd u:object_r:vcd_exec:s0 /vendor/bin/chre u:object_r:chre_exec:s0 /vendor/bin/cbd u:object_r:cbd_exec:s0 -/vendor/bin/modem_svc_sit u:object_r:modem_svc_sit_exec:s0 /vendor/bin/bipchmgr u:object_r:bipchmgr_exec:s0 /vendor/bin/storageproxyd u:object_r:tee_exec:s0 /vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 @@ -174,7 +173,6 @@ /dev/block/platform/13200000\.ufs/by-name/vendor_kernel_boot_[ab] u:object_r:custom_ab_block_device:s0 # Data -/data/vendor/modem_stat(/.*)? u:object_r:modem_stat_data_file:s0 /data/vendor/log/hwc(/.*)? u:object_r:vendor_hwc_log_file:s0 /data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 @@ -199,8 +197,5 @@ /mnt/vendor/persist/uwb(/.*)? u:object_r:persist_uwb_file:s0 /mnt/vendor/persist/display(/.*)? u:object_r:persist_display_file:s0 -# Extra mount images -/mnt/vendor/modem_userdata(/.*)? u:object_r:modem_userdata_file:s0 - # Raw HID device /dev/hidraw[0-9]* u:object_r:hidraw_device:s0 diff --git a/legacy/whitechapel_pro/hwservice.te b/legacy/whitechapel_pro/hwservice.te index 5d7456ce..9b259abf 100644 --- a/legacy/whitechapel_pro/hwservice.te +++ b/legacy/whitechapel_pro/hwservice.te @@ -4,9 +4,6 @@ type hal_radioext_hwservice, hwservice_manager_type; # WLC type hal_wlc_hwservice, hwservice_manager_type; -# rild service -type hal_exynos_rild_hwservice, hwservice_manager_type; - # Fingerprint type hal_fingerprint_ext_hwservice, hwservice_manager_type; diff --git a/legacy/whitechapel_pro/hwservice_contexts b/legacy/whitechapel_pro/hwservice_contexts index 9e820cf5..9fff5cb8 100644 --- a/legacy/whitechapel_pro/hwservice_contexts +++ b/legacy/whitechapel_pro/hwservice_contexts @@ -4,8 +4,5 @@ vendor.goodix.hardware.biometrics.fingerprint::IGoodixFingerprintDaemon # Wireless charger hal vendor.google.wireless_charger::IWirelessCharger u:object_r:hal_wlc_hwservice:s0 -# rild HAL -vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal u:object_r:hal_exynos_rild_hwservice:s0 - # GRIL HAL vendor.google.radioext::IRadioExt u:object_r:hal_radioext_hwservice:s0 diff --git a/vendor/file.te b/vendor/file.te index b933f824..3a3bf56c 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -1,4 +1,5 @@ # Data +type modem_stat_data_file, file_type, data_file_type; type vendor_log_file, file_type, data_file_type; type vendor_rfsd_log_file, file_type, data_file_type; type vendor_slog_file, file_type, data_file_type; @@ -10,6 +11,7 @@ userdebug_or_eng(` # Modem type modem_efs_file, file_type; +type modem_userdata_file, file_type; # Exynos Firmware type vendor_fw_file, vendor_file_type, file_type; diff --git a/vendor/file_contexts b/vendor/file_contexts index 6147047e..0a33599d 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -1,17 +1,20 @@ # Binaries /vendor/bin/rfsd u:object_r:rfsd_exec:s0 /vendor/bin/modem_logging_control u:object_r:modem_logging_control_exec:s0 +/vendor/bin/modem_svc_sit u:object_r:modem_svc_sit_exec:s0 # Data /data/vendor/log/rfsd(/.*)? u:object_r:vendor_rfsd_log_file:s0 /data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 /data/vendor/log(/.*)? u:object_r:vendor_log_file:s0 /data/vendor/slog(/.*)? u:object_r:vendor_slog_file:s0 +/data/vendor/modem_stat(/.*)? u:object_r:modem_stat_data_file:s0 # vendor extra images /mnt/vendor/efs(/.*)? u:object_r:modem_efs_file:s0 /mnt/vendor/efs_backup(/.*)? u:object_r:modem_efs_file:s0 /mnt/vendor/modem_img(/.*)? u:object_r:modem_img_file:s0 +/mnt/vendor/modem_userdata(/.*)? u:object_r:modem_userdata_file:s0 # Vendor Firmwares /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 diff --git a/vendor/hwservice.te b/vendor/hwservice.te index f6d18508..90944b44 100644 --- a/vendor/hwservice.te +++ b/vendor/hwservice.te @@ -1,3 +1,6 @@ # dmd servcie type hal_vendor_oem_hwservice, hwservice_manager_type; +# rild service +type hal_exynos_rild_hwservice, hwservice_manager_type; + diff --git a/vendor/hwservice_contexts b/vendor/hwservice_contexts index dd2a1fa6..ac4d64c1 100644 --- a/vendor/hwservice_contexts +++ b/vendor/hwservice_contexts @@ -1,3 +1,6 @@ # dmd HAL vendor.samsung_slsi.telephony.hardware.oemservice::IOemService u:object_r:hal_vendor_oem_hwservice:s0 +# rild HAL +vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal u:object_r:hal_exynos_rild_hwservice:s0 + diff --git a/legacy/whitechapel_pro/modem_svc_sit.te b/vendor/modem_svc_sit.te similarity index 100% rename from legacy/whitechapel_pro/modem_svc_sit.te rename to vendor/modem_svc_sit.te