Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550
Merged-In: I250fd1c8415c3c865bffa4504c8c290c0d49fddb
Change-Id: Ied5f2da6f2de803a6d19f5de43ba0ffc4f7f0687
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..a3f01c8 100644
--- a/vendor/genfs_contexts
+++ b/vendor/genfs_contexts
@@ -1,177 +1,37 @@
 
 # BMS
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222                 u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9222                 u:object_r:sysfs_wlc:s0
-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-15/15-0061                  u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0061/power_supply     u:object_r:sysfs_batteryinfo:s0
 
 genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply            u:object_r:sysfs_batteryinfo:s0
 # maxfg_base
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-0/0-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-1/1-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-2/2-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-3/3-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-4/4-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-5/5-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-6/6-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-7/7-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-8/8-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-9/9-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-13/13-0036/power_supply     u:object_r:sysfs_batteryinfo:s0
 # maxfg_secondary
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/0-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/1-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/2-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/3-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/4-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/5-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/6-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/7-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/8-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/9-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-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
 
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/backlight/panel1-backlight/als_table u:object_r:sysfs_write_leds:s0
 
 # Haptics
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0043                  u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0042                  u:object_r:sysfs_vibrator:s0
 
 # Power System Suspend
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-1/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-1/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-1/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-1/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-2/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-2/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-2/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-2/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-3/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-3/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-3/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-3/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-4/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-4/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-4/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-4/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-5/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-5/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-5/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-5/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-6/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-6/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-6/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-6/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-9/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-9/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-9/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-9/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-13/13-0036/power_supply/maxfg_base/wakeup                           u:object_r:sysfs_wakeup:s0
 
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-0/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-2/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-3/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-4/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-5/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-6/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-7/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-9/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
-
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-0/0-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-1/1-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-2/2-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-3/3-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-4/4-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-5/5-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-6/6-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-7/7-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-8/8-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-9/9-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
-
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/0-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/0-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/1-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/1-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/2-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/2-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/3-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/3-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/4-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/4-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/5-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/5-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/6-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/6-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/7-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/7-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/8-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/8-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/9-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
-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/google,dual_batt_gauge/power_supply/dualbatt/wakeup                                      u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0036/power_supply/maxfg_flip/wakeup                           u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0036/power_supply/maxfg_secondary/wakeup                      u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0061/power_supply/wireless/wakeup                             u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0061/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;
+