commit c75b7d53828ac58b4f7def543beaf75361409fe5
author Xin Li <delphij@google.com> Fri Oct 06 11:01:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 06 11:01:09 2023 +0000
tree 4cdc40fdf389db890dcea0e3b11cec00d4c4c634
parent c2d02456321061600a543bfc0a9b793522b37f7d
parent 9d2fce0d7c1b7625f4830b89430444360ed20494

[automerger skipped] Merge Android 14 am: 6466e12273 -s ours am: 752b5d4872 -s ours am: b840c7b90e -s ours am: 9d2fce0d7c -s ours

am skip reason: Merged-In I38cd0f3a47a2b3abec09f9effb87b63422fe493a with SHA-1 e10dde6f74 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redbull-sepolicy/+/2776030

Change-Id: Idb4e1b0380dd59aac9d194059a6259ee47895a13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vendor/qcom/common/file.te

diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index 99b8620..37cdeba 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -62,3 +62,4 @@
 type debugfs_ion, debugfs_type, fs_type;
 type debugfs_tzdbg, debugfs_type, fs_type;
 type cnss_vendor_data_file, file_type, data_file_type, mlstrustedobject;
+type sscoredump_vendor_data_coredump_file, file_type, data_file_type, mlstrustedobject;

vendor/qcom/common/file_contexts

diff --git a/vendor/qcom/common/file_contexts b/vendor/qcom/common/file_contexts
index 99df651..ce842ca 100644
--- a/vendor/qcom/common/file_contexts
+++ b/vendor/qcom/common/file_contexts
@@ -261,6 +261,7 @@
 /data/vendor/mediadrm(/.*)?            u:object_r:mediadrm_vendor_data_file:s0
 /data/vendor/nnhal(/.*)?               u:object_r:hal_neuralnetworks_data_file:s0
 /data/vendor/ssrdump(/.*)?             u:object_r:ramdump_vendor_data_file:s0
+/data/vendor/ssrdump/coredump(/.*)?    u:object_r:sscoredump_vendor_data_coredump_file:s0
 /data/vendor/ssrlog(/.*)?              u:object_r:ssr_log_file:s0
 /data/vendor/camera(/.*)?              u:object_r:camera_vendor_data_file:s0
 /data/vendor/location(/.*)?            u:object_r:location_data_file:s0

vendor/qcom/common/hal_bluetooth_default.te

diff --git a/vendor/qcom/common/hal_bluetooth_default.te b/vendor/qcom/common/hal_bluetooth_default.te
index 7df493d..f5f2128 100644
--- a/vendor/qcom/common/hal_bluetooth_default.te
+++ b/vendor/qcom/common/hal_bluetooth_default.te
@@ -4,8 +4,10 @@
 
 userdebug_or_eng(`
   allow hal_bluetooth_default diag_device:chr_file rw_file_perms;
-  allow hal_bluetooth_default ramdump_vendor_data_file:dir rw_dir_perms;
-  allow hal_bluetooth_default ramdump_vendor_data_file:file { create rw_file_perms };
+  allow hal_bluetooth_default ramdump_vendor_data_file:dir create_dir_perms;
+  allow hal_bluetooth_default ramdump_vendor_data_file:file create_file_perms;
+  allow hal_bluetooth_default sscoredump_vendor_data_coredump_file:dir create_dir_perms;
+  allow hal_bluetooth_default sscoredump_vendor_data_coredump_file:file create_file_perms;
   r_dir_file(hal_bluetooth_default, debugfs_ipc)
   set_prop(hal_bluetooth_default, vendor_ssr_prop)
 ')