Merge changes Ia9960af9,I6987d60c into oc-dev
* changes:
NFC HAL no longer violates socket access restrictions
Remove access to sock_file for hal_nfc
diff --git a/public/hal_nfc.te b/public/hal_nfc.te
index 349dea6..a027c48 100644
--- a/public/hal_nfc.te
+++ b/public/hal_nfc.te
@@ -13,4 +13,4 @@
# 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 cc9ee31..c13baa7 100644
--- a/vendor/hal_nfc_default.te
+++ b/vendor/hal_nfc_default.te
@@ -3,6 +3,3 @@
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;