From 3e68836e435519a30a3edb0ca8883569cecf5475 Mon Sep 17 00:00:00 2001 From: Wilson Sung Date: Thu, 23 Mar 2023 05:58:08 +0000 Subject: [PATCH] Revert "Move pixel dumpstate to gs-common" Revert submission 22188471-dumpstate aidl Reason for revert: Build break Reverted changes: /q/submissionid:22188471-dumpstate+aidl Bug: 274858145 Change-Id: I757111541257eecd4936572376fe42a4c866a1d6 --- radio/file.te | 2 ++ radio/file_contexts | 1 + vendor/file_contexts | 1 + vendor/hal_dumpstate_default.te | 5 +++++ 4 files changed, 9 insertions(+) create mode 100644 vendor/hal_dumpstate_default.te diff --git a/radio/file.te b/radio/file.te index 694abdf8..62a9b514 100644 --- a/radio/file.te +++ b/radio/file.te @@ -5,8 +5,10 @@ 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; +type radio_vendor_data_file, file_type, data_file_type; userdebug_or_eng(` typeattribute vendor_gps_file mlstrustedobject; + typeattribute radio_vendor_data_file mlstrustedobject; typeattribute vendor_slog_file mlstrustedobject; ') diff --git a/radio/file_contexts b/radio/file_contexts index 82a519b6..74e4b3ee 100644 --- a/radio/file_contexts +++ b/radio/file_contexts @@ -17,6 +17,7 @@ # 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 diff --git a/vendor/file_contexts b/vendor/file_contexts index 68996988..edce6788 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -1,5 +1,6 @@ # Binaries /vendor/bin/hw/android\.hardware\.health-service\.zuma u:object_r:hal_health_default_exec:s0 +/vendor/bin/hw/android\.hardware\.dumpstate-service\.zuma u:object_r:hal_dumpstate_default_exec:s0 /vendor/bin/hw/android\.hardware\.boot@1\.2-service-zuma u:object_r:hal_bootctl_default_exec:s0 /vendor/bin/hw/android\.hardware\.gxp\.logging@service-gxp-logging u:object_r:gxp_logging_exec:s0 /vendor/bin/hw/android\.hardware\.power\.stats-service\.pixel u:object_r:hal_power_stats_default_exec:s0 diff --git a/vendor/hal_dumpstate_default.te b/vendor/hal_dumpstate_default.te new file mode 100644 index 00000000..3e4db459 --- /dev/null +++ b/vendor/hal_dumpstate_default.te @@ -0,0 +1,5 @@ +allow hal_dumpstate_default vendor_toolbox_exec:file execute_no_trans; +allow hal_dumpstate_default radio_vendor_data_file:dir create_dir_perms; +allow hal_dumpstate_default radio_vendor_data_file:file create_file_perms; +allow hal_dumpstate_default shell_data_file:file getattr; +