diff --git a/tracking_denials/hal_dumpstate_default.te b/tracking_denials/hal_dumpstate_default.te
index e0535f63..77a56853 100644
--- a/tracking_denials/hal_dumpstate_default.te
+++ b/tracking_denials/hal_dumpstate_default.te
@@ -1,39 +1,73 @@
 # b/208721677
+# b/208909124
+dontaudit hal_dumpstate_default aoc_device:chr_file { getattr open read write };
 dontaudit hal_dumpstate_default boottime_public_prop:file { open };
 dontaudit hal_dumpstate_default boottime_public_prop:file { read };
+dontaudit hal_dumpstate_default citadeld:binder call;
 dontaudit hal_dumpstate_default citadeld_service:service_manager { find };
-dontaudit hal_dumpstate_default debugfs:file { open };
-dontaudit hal_dumpstate_default debugfs:file { read };
+dontaudit hal_dumpstate_default citadel_updater:file execute_no_trans;
+dontaudit hal_dumpstate_default debugfs:dir { open read };
 dontaudit hal_dumpstate_default debugfs_f2fs:dir { search };
 dontaudit hal_dumpstate_default debugfs_f2fs:file { open };
 dontaudit hal_dumpstate_default debugfs_f2fs:file { read };
+dontaudit hal_dumpstate_default debugfs:file { open };
+dontaudit hal_dumpstate_default debugfs:file { read };
+dontaudit hal_dumpstate_default device:dir read;
+dontaudit hal_dumpstate_default device:dir watch;
 dontaudit hal_dumpstate_default logbuffer_device:chr_file { getattr };
 dontaudit hal_dumpstate_default logbuffer_device:chr_file { open };
 dontaudit hal_dumpstate_default logbuffer_device:chr_file { read };
+dontaudit hal_dumpstate_default mnt_vendor_file:dir { search };
+dontaudit hal_dumpstate_default modem_efs_file:dir search;
+dontaudit hal_dumpstate_default modem_efs_file:file { open read };
+dontaudit hal_dumpstate_default modem_stat_data_file:file getattr;
 dontaudit hal_dumpstate_default modem_stat_data_file:file { open };
 dontaudit hal_dumpstate_default modem_stat_data_file:file { read };
+dontaudit hal_dumpstate_default property_type:file *;
+dontaudit hal_dumpstate_default radio_vendor_data_file:dir add_name;
+dontaudit hal_dumpstate_default radio_vendor_data_file:dir create;
 dontaudit hal_dumpstate_default radio_vendor_data_file:dir { getattr };
 dontaudit hal_dumpstate_default radio_vendor_data_file:dir { open };
 dontaudit hal_dumpstate_default radio_vendor_data_file:dir { read };
+dontaudit hal_dumpstate_default radio_vendor_data_file:dir { remove_name rmdir };
 dontaudit hal_dumpstate_default radio_vendor_data_file:dir { search };
 dontaudit hal_dumpstate_default radio_vendor_data_file:dir { write };
+dontaudit hal_dumpstate_default radio_vendor_data_file:file { create write };
 dontaudit hal_dumpstate_default radio_vendor_data_file:file { getattr };
 dontaudit hal_dumpstate_default radio_vendor_data_file:file { open };
 dontaudit hal_dumpstate_default radio_vendor_data_file:file { read };
 dontaudit hal_dumpstate_default radio_vendor_data_file:file { setattr };
-dontaudit hal_dumpstate_default sysfs:file { read };
+dontaudit hal_dumpstate_default radio_vendor_data_file:file unlink;
+dontaudit hal_dumpstate_default ramdump_vendor_mnt_file:dir { search };
+dontaudit hal_dumpstate_default shell_data_file:file { getattr };
+dontaudit hal_dumpstate_default sscoredump_vendor_data_crashinfo_file:dir { open read };
+dontaudit hal_dumpstate_default sscoredump_vendor_data_crashinfo_file:dir search;
 dontaudit hal_dumpstate_default sysfs_acpm_stats:dir { open };
 dontaudit hal_dumpstate_default sysfs_acpm_stats:dir { read };
 dontaudit hal_dumpstate_default sysfs_acpm_stats:dir { search };
 dontaudit hal_dumpstate_default sysfs_acpm_stats:file { open };
 dontaudit hal_dumpstate_default sysfs_acpm_stats:file { read };
+dontaudit hal_dumpstate_default sysfs_aoc:dir { search };
+dontaudit hal_dumpstate_default sysfs_aoc_dumpstate:file { open read };
+dontaudit hal_dumpstate_default sysfs_batteryinfo:dir { open };
+dontaudit hal_dumpstate_default sysfs_batteryinfo:dir { read };
+dontaudit hal_dumpstate_default sysfs_batteryinfo:dir { search };
+dontaudit hal_dumpstate_default sysfs_batteryinfo:file getattr;
+dontaudit hal_dumpstate_default sysfs_batteryinfo:file { open };
+dontaudit hal_dumpstate_default sysfs_batteryinfo:file { read };
 dontaudit hal_dumpstate_default sysfs_bcl:dir { open };
 dontaudit hal_dumpstate_default sysfs_bcl:dir { read };
 dontaudit hal_dumpstate_default sysfs_bcl:dir { search };
 dontaudit hal_dumpstate_default sysfs_bcl:file { getattr };
+dontaudit hal_dumpstate_default sysfs_bcl:file open;
 dontaudit hal_dumpstate_default sysfs_bcl:file { read };
 dontaudit hal_dumpstate_default sysfs_chip_id:file { open };
 dontaudit hal_dumpstate_default sysfs_chip_id:file { read };
+dontaudit hal_dumpstate_default sysfs_exynos_bts:dir { search };
+dontaudit hal_dumpstate_default sysfs_exynos_bts_stats:file { open };
+dontaudit hal_dumpstate_default sysfs_exynos_bts_stats:file { read };
+dontaudit hal_dumpstate_default sysfs:file { open };
+dontaudit hal_dumpstate_default sysfs:file { read };
 dontaudit hal_dumpstate_default sysfs_thermal:dir { open };
 dontaudit hal_dumpstate_default sysfs_thermal:dir { read };
 dontaudit hal_dumpstate_default sysfs_thermal:dir { search };
@@ -42,37 +76,37 @@ dontaudit hal_dumpstate_default sysfs_thermal:file { read };
 dontaudit hal_dumpstate_default sysfs_wifi:dir { search };
 dontaudit hal_dumpstate_default sysfs_wifi:file { open };
 dontaudit hal_dumpstate_default sysfs_wifi:file { read };
-dontaudit hal_dumpstate_default vendor_dmabuf_debugfs:file { open };
-dontaudit hal_dumpstate_default vendor_dmabuf_debugfs:file { read };
-dontaudit hal_dumpstate_default vendor_dumpsys:file { execute_no_trans };
-dontaudit hal_dumpstate_default vendor_shell_exec:file { execute_no_trans };
-dontaudit hal_dumpstate_default vendor_toolbox_exec:file { execute_no_trans };
-dontaudit hal_dumpstate_default vndbinder_device:chr_file { read };
-# b/208909124
-dontaudit hal_dumpstate_default property_type:file *;
-dontaudit hal_dumpstate_default mnt_vendor_file:dir { search };
-dontaudit hal_dumpstate_default ramdump_vendor_mnt_file:dir { search };
-dontaudit hal_dumpstate_default shell_data_file:file { getattr };
-dontaudit hal_dumpstate_default sysfs:file { open };
-dontaudit hal_dumpstate_default sysfs_aoc:dir { search };
-dontaudit hal_dumpstate_default sysfs_batteryinfo:dir { open };
-dontaudit hal_dumpstate_default sysfs_batteryinfo:dir { read };
-dontaudit hal_dumpstate_default sysfs_batteryinfo:dir { search };
-dontaudit hal_dumpstate_default sysfs_batteryinfo:file { open };
-dontaudit hal_dumpstate_default sysfs_batteryinfo:file { read };
-dontaudit hal_dumpstate_default sysfs_exynos_bts:dir { search };
-dontaudit hal_dumpstate_default sysfs_exynos_bts_stats:file { open };
-dontaudit hal_dumpstate_default sysfs_exynos_bts_stats:file { read };
 dontaudit hal_dumpstate_default sysfs_wlc:dir { search };
+dontaudit hal_dumpstate_default sysfs_wlc:file { open read };
+dontaudit hal_dumpstate_default vendor_battery_debugfs:dir { open read };
+dontaudit hal_dumpstate_default vendor_battery_debugfs:dir search;
+dontaudit hal_dumpstate_default vendor_battery_debugfs:file { getattr open read };
+dontaudit hal_dumpstate_default vendor_camera_data_file:dir search;
 dontaudit hal_dumpstate_default vendor_charger_debugfs:dir { open };
 dontaudit hal_dumpstate_default vendor_charger_debugfs:dir { read };
 dontaudit hal_dumpstate_default vendor_charger_debugfs:dir { search };
 dontaudit hal_dumpstate_default vendor_charger_debugfs:file { getattr };
+dontaudit hal_dumpstate_default vendor_charger_debugfs:file open;
 dontaudit hal_dumpstate_default vendor_charger_debugfs:file { read };
+dontaudit hal_dumpstate_default vendor_dmabuf_debugfs:file { open };
+dontaudit hal_dumpstate_default vendor_dmabuf_debugfs:file { read };
+dontaudit hal_dumpstate_default vendor_dumpsys:file { execute_no_trans };
+dontaudit hal_dumpstate_default vendor_gps_file:dir { open read search };
+dontaudit hal_dumpstate_default vendor_gps_file:file getattr;
+dontaudit hal_dumpstate_default vendor_gps_file:file { open read };
+dontaudit hal_dumpstate_default vendor_log_file:dir search;
+dontaudit hal_dumpstate_default vendor_maxfg_debugfs:dir search;
+dontaudit hal_dumpstate_default vendor_maxfg_debugfs:file { open read };
 dontaudit hal_dumpstate_default vendor_pm_genpd_debugfs:file { open };
 dontaudit hal_dumpstate_default vendor_pm_genpd_debugfs:file { read };
-dontaudit hal_dumpstate_default vndbinder_device:chr_file { ioctl };
-dontaudit hal_dumpstate_default vndbinder_device:chr_file { map };
-dontaudit hal_dumpstate_default vndbinder_device:chr_file { open };
-dontaudit hal_dumpstate_default vndbinder_device:chr_file { write };
-dontaudit hal_dumpstate_default vndservicemanager:binder { call };
+dontaudit hal_dumpstate_default vendor_rfsd_log_file:dir { open read search };
+dontaudit hal_dumpstate_default vendor_rfsd_log_file:file { getattr open read };
+dontaudit hal_dumpstate_default vendor_shell_exec:file { execute_no_trans };
+dontaudit hal_dumpstate_default vendor_slog_file:file { getattr read };
+dontaudit hal_dumpstate_default vendor_slog_file:file open;
+dontaudit hal_dumpstate_default vendor_toolbox_exec:file { execute_no_trans };
+dontaudit hal_dumpstate_default vendor_usf_reg_edit:file execute_no_trans;
+dontaudit hal_dumpstate_default vendor_usf_stats:file execute_no_trans;
+dontaudit hal_dumpstate_default vendor_votable_debugfs:dir { open read };
+dontaudit hal_dumpstate_default vendor_votable_debugfs:dir search;
+dontaudit hal_dumpstate_default vendor_votable_debugfs:file { getattr open read };
diff --git a/whitechapel_pro/hal_dumpstate_default.te b/whitechapel_pro/hal_dumpstate_default.te
index 228cf2ba..73fd2cd3 100644
--- a/whitechapel_pro/hal_dumpstate_default.te
+++ b/whitechapel_pro/hal_dumpstate_default.te
@@ -9,3 +9,4 @@ allow hal_dumpstate_default sysfs_touch:file rw_file_perms;
 
 allow hal_dumpstate_default vendor_displaycolor_service:service_manager find;
 binder_call(hal_dumpstate_default, hal_graphics_composer_default);
+vndbinder_use(hal_dumpstate_default)