diff --git a/sepolicy/vendor/hal_cameraHIDL.te b/sepolicy/vendor/hal_cameraHIDL.te
index fc6f13c..0e297b4 100644
--- a/sepolicy/vendor/hal_cameraHIDL.te
+++ b/sepolicy/vendor/hal_cameraHIDL.te
@@ -1,4 +1,5 @@
 binder_call(hal_cameraHIDL_client, hal_cameraHIDL_server)
 binder_call(hal_cameraHIDL_server, hal_cameraHIDL_client)
 
-hal_attribute_hwservice(hal_cameraHIDL, hal_cameraHIDL_hwservice)
+add_hwservice(hal_cameraHIDL_server, hal_cameraHIDL_hwservice)
+allow hal_cameraHIDL_client hal_cameraHIDL_hwservice:hwservice_manager find;
diff --git a/sepolicy/vendor/hal_display.te b/sepolicy/vendor/hal_display.te
index f9f233d..6e94a9d 100644
--- a/sepolicy/vendor/hal_display.te
+++ b/sepolicy/vendor/hal_display.te
@@ -1,4 +1,5 @@
 binder_call(hal_display_client, hal_display_server)
 binder_call(hal_display_server, hal_display_client)
 
-hal_attribute_hwservice(hal_display, hal_display_hwservice)
+add_hwservice(hal_display_server, hal_display_hwservice)
+allow hal_display_client hal_display_hwservice:hwservice_manager find;
diff --git a/sepolicy/vendor/hal_display_iris.te b/sepolicy/vendor/hal_display_iris.te
index 5f95ce6..b0d655d 100644
--- a/sepolicy/vendor/hal_display_iris.te
+++ b/sepolicy/vendor/hal_display_iris.te
@@ -1,4 +1,5 @@
 binder_call(hal_display_iris_client, hal_display_iris_server)
 binder_call(hal_display_iris_server, hal_display_iris_client)
 
-hal_attribute_hwservice(hal_display_iris, hal_display_iris_hwservice)
+add_hwservice(hal_display_iris_server, hal_display_iris_hwservice)
+allow hal_display_iris_client hal_display_iris_hwservice:hwservice_manager find;
diff --git a/sepolicy/vendor/hal_hdcpkey.te b/sepolicy/vendor/hal_hdcpkey.te
index 0d3ca18..9a9c7f6 100644
--- a/sepolicy/vendor/hal_hdcpkey.te
+++ b/sepolicy/vendor/hal_hdcpkey.te
@@ -1,4 +1,5 @@
 binder_call(hal_hdcpkey_client, hal_hdcpkey_server)
 binder_call(hal_hdcpkey_server, hal_hdcpkey_client)
 
-hal_attribute_hwservice(hal_hdcpkey, hal_hdcpkey_hwservice)
+add_hwservice(hal_hdcpkey_server, hal_hdcpkey_hwservice)
+allow hal_hdcpkey_client hal_hdcpkey_hwservice:hwservice_manager find;
diff --git a/sepolicy/vendor/hal_param.te b/sepolicy/vendor/hal_param.te
index 27a3543..040c0bf 100644
--- a/sepolicy/vendor/hal_param.te
+++ b/sepolicy/vendor/hal_param.te
@@ -1,4 +1,5 @@
 binder_call(hal_param_client, hal_param_server)
 binder_call(hal_param_server, hal_param_client)
 
-hal_attribute_hwservice(hal_param, hal_param_hwservice)
+add_hwservice(hal_param_server, hal_param_hwservice)
+allow hal_param_client hal_param_hwservice:hwservice_manager find;
diff --git a/sepolicy/vendor/nfc.te b/sepolicy/vendor/nfc.te
deleted file mode 100644
index b3465c4..0000000
--- a/sepolicy/vendor/nfc.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# Allow nfc to get vendor_nfc_prop
-get_prop(nfc, vendor_nfc_prop)
diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
index 6afd980..5a1d5d8 100644
--- a/sepolicy/vendor/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
@@ -11,4 +11,3 @@ allow vendor_init proc_watermark_boost_factor:file rw_file_perms;
 get_prop(vendor_init, vendor_db_security_prop)
 set_prop(vendor_init, vendor_oem_bluetooth_prop)
 set_prop(vendor_init, vendor_oem_wifi_prop)
-set_prop(vendor_init, vendor_persist_camera_prop)