From 62b41afb1e30e58145d691622cd064fd7dec4da9 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 1 Nov 2022 11:12:18 +0800 Subject: [PATCH] review rild Bug: 254378739 Test: boot with rild launched Change-Id: I90a800bb6b15732cc2fcfdafc5174f8c874b55ef --- legacy/whitechapel_pro/file.te | 1 - legacy/whitechapel_pro/file_contexts | 2 -- legacy/whitechapel_pro/property.te | 1 - legacy/whitechapel_pro/property_contexts | 2 -- legacy/whitechapel_pro/vendor_init.te | 3 --- vendor/file.te | 1 + vendor/file_contexts | 2 ++ vendor/property.te | 1 + vendor/property_contexts | 1 + {legacy/whitechapel_pro => vendor}/rild.te | 2 ++ vendor/vendor_init.te | 3 +++ 11 files changed, 10 insertions(+), 9 deletions(-) rename {legacy/whitechapel_pro => vendor}/rild.te (94%) diff --git a/legacy/whitechapel_pro/file.te b/legacy/whitechapel_pro/file.te index 27a92e70..432a7256 100644 --- a/legacy/whitechapel_pro/file.te +++ b/legacy/whitechapel_pro/file.te @@ -1,5 +1,4 @@ # Data -type rild_vendor_data_file, file_type, data_file_type; type vendor_hwc_log_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; diff --git a/legacy/whitechapel_pro/file_contexts b/legacy/whitechapel_pro/file_contexts index 0e2949d4..4d9b0999 100644 --- a/legacy/whitechapel_pro/file_contexts +++ b/legacy/whitechapel_pro/file_contexts @@ -32,7 +32,6 @@ /vendor/bin/hw/vendor\.google\.wireless_charger@1\.3-service-vendor u:object_r:hal_wlc_exec:s0 /vendor/bin/hw/android\.hardware\.usb-service u:object_r:hal_usb_impl_exec:s0 /vendor/bin/hw/android\.hardware\.usb\.gadget-service u:object_r:hal_usb_gadget_impl_exec:s0 -/vendor/bin/hw/rild_exynos u:object_r:rild_exec:s0 /vendor/bin/hw/android\.hardware\.qorvo\.uwb\.service u:object_r:hal_uwb_vendor_default_exec:s0 /vendor/bin/rlsservice u:object_r:rlsservice_exec:s0 /vendor/bin/hw/android\.hardware\.gxp\.logging@service-gxp-logging u:object_r:gxp_logging_exec:s0 @@ -173,7 +172,6 @@ # Data /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 /data/nfc(/.*)? u:object_r:nfc_data_file:s0 /data/vendor/firmware/wifi(/.*)? u:object_r:updated_wifi_firmware_data_file:s0 diff --git a/legacy/whitechapel_pro/property.te b/legacy/whitechapel_pro/property.te index 93f5a5a7..04cc41d1 100644 --- a/legacy/whitechapel_pro/property.te +++ b/legacy/whitechapel_pro/property.te @@ -1,4 +1,3 @@ -vendor_internal_prop(vendor_carrier_prop) vendor_internal_prop(vendor_nfc_prop) vendor_internal_prop(vendor_secure_element_prop) vendor_internal_prop(vendor_battery_profile_prop) diff --git a/legacy/whitechapel_pro/property_contexts b/legacy/whitechapel_pro/property_contexts index 0e8e58f3..ab2446af 100644 --- a/legacy/whitechapel_pro/property_contexts +++ b/legacy/whitechapel_pro/property_contexts @@ -6,8 +6,6 @@ vendor.tcpdump. u:object_r:vendor_tcpdump_log_prop:s0 persist.vendor.usb. u:object_r:vendor_usb_config_prop:s0 vendor.usb. u:object_r:vendor_usb_config_prop:s0 -ro.vendor.config.build_carrier u:object_r:vendor_carrier_prop:s0 - # test battery profile persist.vendor.testing_battery_profile u:object_r:vendor_battery_profile_prop:s0 diff --git a/legacy/whitechapel_pro/vendor_init.te b/legacy/whitechapel_pro/vendor_init.te index 8284b06b..69ab008d 100644 --- a/legacy/whitechapel_pro/vendor_init.te +++ b/legacy/whitechapel_pro/vendor_init.te @@ -1,12 +1,9 @@ allow vendor_init bootdevice_sysdev:file create_file_perms; set_prop(vendor_init, vendor_ssrdump_prop) -set_prop(vendor_init, vendor_carrier_prop) get_prop(vendor_init, vendor_battery_profile_prop) set_prop(vendor_init, vendor_device_prop) -set_prop(vendor_init, vendor_modem_prop) set_prop(vendor_init, vendor_usb_config_prop) -set_prop(vendor_init, vendor_rild_prop) set_prop(vendor_init, logpersistd_logging_prop) set_prop(vendor_init, vendor_logger_prop) diff --git a/vendor/file.te b/vendor/file.te index 3b923eb6..859dba65 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -1,4 +1,5 @@ # Data +type rild_vendor_data_file, file_type, data_file_type; type vendor_gps_file, file_type, data_file_type; type modem_stat_data_file, file_type, data_file_type; type vendor_log_file, file_type, data_file_type; diff --git a/vendor/file_contexts b/vendor/file_contexts index d3398c52..eea10215 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -3,6 +3,7 @@ /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 /vendor/bin/cbd u:object_r:cbd_exec:s0 +/vendor/bin/hw/rild_exynos u:object_r:rild_exec:s0 # Data /data/vendor/log/rfsd(/.*)? u:object_r:vendor_rfsd_log_file:s0 @@ -10,6 +11,7 @@ /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 +/data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0 # vendor extra images /mnt/vendor/efs(/.*)? u:object_r:modem_efs_file:s0 diff --git a/vendor/property.te b/vendor/property.te index 1ba3a8e2..e02b20fc 100644 --- a/vendor/property.te +++ b/vendor/property.te @@ -1,3 +1,4 @@ +vendor_internal_prop(vendor_carrier_prop) vendor_internal_prop(vendor_cbd_prop) vendor_internal_prop(vendor_slog_prop) vendor_internal_prop(vendor_persist_config_default_prop) diff --git a/vendor/property_contexts b/vendor/property_contexts index 5330cc2c..03805be4 100644 --- a/vendor/property_contexts +++ b/vendor/property_contexts @@ -29,6 +29,7 @@ vendor.ril. u:object_r:vendor_rild_prop:s0 vendor.radio. u:object_r:vendor_rild_prop:s0 vendor.sys.rild_reset u:object_r:vendor_rild_prop:s0 persist.vendor.radio. u:object_r:vendor_rild_prop:s0 +ro.vendor.config.build_carrier u:object_r:vendor_carrier_prop:s0 # SSR Detector vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 diff --git a/legacy/whitechapel_pro/rild.te b/vendor/rild.te similarity index 94% rename from legacy/whitechapel_pro/rild.te rename to vendor/rild.te index d8c8c290..bfabf428 100644 --- a/legacy/whitechapel_pro/rild.te +++ b/vendor/rild.te @@ -26,6 +26,8 @@ binder_call(rild, oemrilservice_app) binder_call(rild, hal_secure_element_uicc) binder_call(rild, grilservice_app) binder_call(rild, vendor_engineermode_app) +binder_call(rild, vendor_telephony_debug_app) +binder_call(rild, logger_app) # for hal service add_hwservice(rild, hal_exynos_rild_hwservice) diff --git a/vendor/vendor_init.te b/vendor/vendor_init.te index 4218745a..c6230baf 100644 --- a/vendor/vendor_init.te +++ b/vendor/vendor_init.te @@ -1 +1,4 @@ set_prop(vendor_init, vendor_cbd_prop) +set_prop(vendor_init, vendor_carrier_prop) +set_prop(vendor_init, vendor_modem_prop) +set_prop(vendor_init, vendor_rild_prop)