[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 3b8ff0887e -s ours
am skip reason: Merged-In I6cf8988e22bbbcac11a8b195f00021c0920f7e6d with SHA-1 fe45ceb4ef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix-sepolicy/+/25973916
Change-Id: I70eb3413168baab521365b329fc2cae7e0e06012
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/vendor/file.te b/vendor/file.te
new file mode 100644
index 0000000..6e3395b
--- /dev/null
+++ b/vendor/file.te
@@ -0,0 +1,3 @@
+# BT
+type vendor_bt_data_file, file_type, data_file_type;
+
diff --git a/vendor/file_contexts b/vendor/file_contexts
index 05e853f..4d1ec3b 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -11,6 +11,7 @@
/dev/ttySAC18 u:object_r:hci_attach_dev:s0
/dev/logbuffer_btlpm u:object_r:logbuffer_device:s0
/dev/logbuffer_tty18 u:object_r:logbuffer_device:s0
+/data/vendor/bluetooth(/.*)? u:object_r:vendor_bt_data_file:s0
# Haptics
/vendor/bin/hw/android\.hardware\.vibrator-service\.cs40l26-private u:object_r:hal_vibrator_default_exec:s0
diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts
index 81332b5..b54535a 100644
--- a/vendor/genfs_contexts
+++ b/vendor/genfs_contexts
@@ -20,6 +20,7 @@
genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9222/power_supply u:object_r:sysfs_batteryinfo:s0
genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-p9222 u:object_r:sysfs_wlc:s0
genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-p9222/power_supply u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/8-0061 u:object_r:sysfs_wlc:s0
genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply u:object_r:sysfs_batteryinfo:s0
# maxfg_base
@@ -46,12 +47,14 @@
genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/9-0036/power_supply u:object_r:sysfs_batteryinfo:s0
# Display
+genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/available_disp_stats u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/gamma u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/min_vrefresh u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/idle_delay_ms u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_idle u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_need_handle_idle_exit u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/osc2_clk_khz u:object_r:sysfs_display:s0
+genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/time_in_state u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/hs_clock u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c241000.drmdecon/early_wakeup u:object_r:sysfs_display:s0
@@ -173,5 +176,5 @@
genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/9-0036/power_supply/maxfg_secondary/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-p9222/power_supply/wireless/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-p9222/wakeup u:object_r:sysfs_wakeup:s0
-
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/8-0061/wakeup/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply/dualbatt/wakeup u:object_r:sysfs_wakeup:s0
diff --git a/vendor/hal_bluetooth_btlinux.te b/vendor/hal_bluetooth_btlinux.te
new file mode 100644
index 0000000..851dc89
--- /dev/null
+++ b/vendor/hal_bluetooth_btlinux.te
@@ -0,0 +1,3 @@
+allow hal_bluetooth_btlinux vendor_bt_data_file:dir rw_dir_perms;
+allow hal_bluetooth_btlinux vendor_bt_data_file:file create_file_perms;
+
