From d74e9897392060304ca620f2c2e2f38030d266f1 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 22 Jun 2021 12:46:00 +0800 Subject: [PATCH] modulize init.radio.sh Bug: 190331600 Test: build ROM and make sure the file is there and functional. Change-Id: Icb3e0e590ae315d53eb5251fd5e74d6aacab1fe2 --- public/file.te | 3 +++ telephony/user/file_contexts | 5 +++++ {whitechapel/vendor/google => telephony/user}/init_radio.te | 0 whitechapel/vendor/google/file.te | 3 --- whitechapel/vendor/google/file_contexts | 6 ------ 5 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 telephony/user/file_contexts rename {whitechapel/vendor/google => telephony/user}/init_radio.te (100%) diff --git a/public/file.te b/public/file.te index 4c15c474..2aef505f 100644 --- a/public/file.te +++ b/public/file.te @@ -5,3 +5,6 @@ userdebug_or_eng(` ') type proc_vendor_sched, proc_type, fs_type; +# Radio +type radio_vendor_data_file, file_type, data_file_type, mlstrustedobject; + diff --git a/telephony/user/file_contexts b/telephony/user/file_contexts new file mode 100644 index 00000000..1e0c1a44 --- /dev/null +++ b/telephony/user/file_contexts @@ -0,0 +1,5 @@ +# ECC List +/vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 +# Radio files. +/data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 + diff --git a/whitechapel/vendor/google/init_radio.te b/telephony/user/init_radio.te similarity index 100% rename from whitechapel/vendor/google/init_radio.te rename to telephony/user/init_radio.te diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te index a7eeea53..ce5b993c 100644 --- a/whitechapel/vendor/google/file.te +++ b/whitechapel/vendor/google/file.te @@ -105,9 +105,6 @@ type persist_aoc_file, file_type, vendor_persist_type; type audio_vendor_data_file, file_type, data_file_type; type aoc_audio_file, file_type, vendor_file_type; -# Radio -type radio_vendor_data_file, file_type, data_file_type, mlstrustedobject; - # RILD type rild_vendor_data_file, file_type, data_file_type; diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts index 4b8ac2dd..379ef830 100644 --- a/whitechapel/vendor/google/file_contexts +++ b/whitechapel/vendor/google/file_contexts @@ -348,9 +348,6 @@ # R4 /vendor/bin/hw/hardware\.qorvo\.uwb-service u:object_r:hal_uwb_default_exec:s0 -# Radio files. -/data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 - # RILD files /data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0 @@ -384,9 +381,6 @@ /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.fpc u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.fpc u:object_r:hal_fingerprint_default_exec:s0 -# ECC List -/vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 - # Zram /data/per_boot(/.*)? u:object_r:per_boot_file:s0