diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index 927296d2afaff1b4e855434d789543ac341acf16..56165273dd556f88ce06a61d14c7b97fdc31bea6 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -40,6 +40,7 @@
     thermalserviced_tmpfs
     timezone_service
     tombstoned_java_trace_socket
+    tombstone_wifi_data_file
     update_engine_log_data_file
     vendor_init
     vold_prepare_subdirs
diff --git a/private/file_contexts b/private/file_contexts
index ad6a9222d6eba6f7a6aaaef0e2122c56a05a33c8..f4e5bd9d0ea66da2495f869d17c526cabd992e35 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -349,6 +349,7 @@
 /data/app-private(/.*)?               u:object_r:apk_private_data_file:s0
 /data/app-private/vmdl.*\.tmp(/.*)?   u:object_r:apk_private_tmp_file:s0
 /data/tombstones(/.*)?	u:object_r:tombstone_data_file:s0
+/data/vendor/tombstones/wifi(/.*)? u:object_r:tombstone_wifi_data_file:s0
 /data/local/tmp(/.*)?	u:object_r:shell_data_file:s0
 /data/media(/.*)?	u:object_r:media_rw_data_file:s0
 /data/mediadrm(/.*)?	u:object_r:media_data_file:s0
diff --git a/public/file.te b/public/file.te
index 339f57d963f379ce90f02220e62cf156333ebb4a..81bb1f1e1259a7bc6d961bff3a2885701f2a5a76 100644
--- a/public/file.te
+++ b/public/file.te
@@ -163,6 +163,8 @@ type adb_data_file, file_type, data_file_type, core_data_file_type;
 type anr_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
 # /data/tombstones - core dumps
 type tombstone_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
+# /data/vendor/tombstones/wifi - vendor wifi dumps
+type tombstone_wifi_data_file, file_type, data_file_type;
 # /data/app - user-installed apps
 type apk_data_file, file_type, data_file_type, core_data_file_type;
 type apk_tmp_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
diff --git a/public/hal_wifi.te b/public/hal_wifi.te
index ac8a0d9f13a266bd9e04a5bc655e376e877b1551..b8693fb3a1218b8cfef06a751a9d63a27f5bd3c7 100644
--- a/public/hal_wifi.te
+++ b/public/hal_wifi.te
@@ -23,3 +23,9 @@ allow hal_wifi self:netlink_generic_socket create_socket_perms_no_ioctl;
 allow hal_wifi sysfs_wlan_fwpath:file { w_file_perms };
 # allow hal_wifi to access /proc/modules to check if Wi-Fi driver is loaded
 allow hal_wifi proc_modules:file { getattr open read };
+
+# allow hal_wifi to write into /data/vendor/tombstones/wifi
+userdebug_or_eng(`
+  allow hal_wifi_server tombstone_wifi_data_file:dir rw_dir_perms;
+  allow hal_wifi_server tombstone_wifi_data_file:file create_file_perms;
+')