diff --git a/public/hal_nfc.te b/public/hal_nfc.te
index 349dea6a3863fc13ba982407320d6da279bf7afe..a027c48bebd80f1830d357c807b5cbc88e5b1da9 100644
--- a/public/hal_nfc.te
+++ b/public/hal_nfc.te
@@ -13,4 +13,4 @@ allow hal_nfc nfc_device:chr_file rw_file_perms;
 
 # Data file accesses.
 allow hal_nfc nfc_data_file:dir create_dir_perms;
-allow hal_nfc nfc_data_file:notdevfile_class_set create_file_perms;
+allow hal_nfc nfc_data_file:{ file lnk_file fifo_file } create_file_perms;
diff --git a/vendor/hal_nfc_default.te b/vendor/hal_nfc_default.te
index cc9ee317178f6f7f8273794593dfac7d4266be86..c13baa7ed10787015c87e0e04ae1f1c9a94a7dd6 100644
--- a/vendor/hal_nfc_default.te
+++ b/vendor/hal_nfc_default.te
@@ -3,6 +3,3 @@ hal_server_domain(hal_nfc_default, hal_nfc)
 
 type hal_nfc_default_exec, exec_type, vendor_file_type, file_type;
 init_daemon_domain(hal_nfc_default)
-
-# TODO(b/37640900): Remove this one NFC HAL no longer needs access to nfc_data_file:sock_file
-typeattribute hal_nfc_default socket_between_core_and_vendor_violators;