From 41ed8e83ea86b2670d4c192fb716140dcdd1029f Mon Sep 17 00:00:00 2001 From: Sebastian Pickl Date: Wed, 5 Jul 2023 09:45:56 +0000 Subject: [PATCH] Revert "Allow bthal to access vendor bluetooth folder" Revert submission 23844270-P22-vendor-log-udc-qpr Reason for revert: causes selinux tests to fail b/289989584 go/abtd: https://android-build.googleplex.com/builds/abtd/run/L37600000961782595 Bug:289989584 Reverted changes: /q/submissionid:23844270-P22-vendor-log-udc-qpr Change-Id: I4e9ccf17050702a6405c549340e7fe97eba0eb65 --- whitechapel_pro/bluetooth.te | 3 +++ whitechapel_pro/file.te | 3 --- whitechapel_pro/file_contexts | 1 - whitechapel_pro/hal_bluetooth_btlinux.te | 5 ----- 4 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 whitechapel_pro/hal_bluetooth_btlinux.te diff --git a/whitechapel_pro/bluetooth.te b/whitechapel_pro/bluetooth.te index aff0e1a4..3795e299 100644 --- a/whitechapel_pro/bluetooth.te +++ b/whitechapel_pro/bluetooth.te @@ -1,2 +1,5 @@ allow bluetooth proc_vendor_sched:dir r_dir_perms; allow bluetooth proc_vendor_sched:file w_file_perms; + +allow hal_bluetooth_btlinux aoc_device:chr_file { getattr open read write }; +allow hal_bluetooth_btlinux device:dir r_dir_perms; \ No newline at end of file diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index 0038103c..4a232600 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -68,9 +68,6 @@ type persist_display_file, file_type, vendor_persist_type; # CHRE type chre_socket, file_type; -# BT -type vendor_bt_data_file, file_type, data_file_type; - # Storage Health HAL type proc_f2fs, proc_type, fs_type; diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index 35f991ba..c4f5b098 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -211,7 +211,6 @@ /dev/maxfg_history u:object_r:battery_history_device:s0 /dev/battery_history u:object_r:battery_history_device:s0 /data/vendor/powerstats(/.*)? u:object_r:powerstats_vendor_data_file:s0 -/data/vendor/bluetooth(/.*)? u:object_r:vendor_bt_data_file:s0 # Persist /mnt/vendor/persist/battery(/.*)? u:object_r:persist_battery_file:s0 diff --git a/whitechapel_pro/hal_bluetooth_btlinux.te b/whitechapel_pro/hal_bluetooth_btlinux.te deleted file mode 100644 index dc746294..00000000 --- a/whitechapel_pro/hal_bluetooth_btlinux.te +++ /dev/null @@ -1,5 +0,0 @@ -allow hal_bluetooth_btlinux aoc_device:chr_file { getattr open read write }; -allow hal_bluetooth_btlinux device:dir r_dir_perms; - -allow hal_bluetooth_btlinux vendor_bt_data_file:dir rw_dir_perms; -allow hal_bluetooth_btlinux vendor_bt_data_file:file create_file_perms;