sepolicy: adding vendor prefix to avoid naming colision
Change-Id: Ib403824c380696e1fca97ef744863a6e15000395
diff --git a/generic/vendor/common/adsprpcd.te b/generic/vendor/common/adsprpcd.te
index 3baa393..55d38d9 100644
--- a/generic/vendor/common/adsprpcd.te
+++ b/generic/vendor/common/adsprpcd.te
@@ -24,20 +24,20 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type adsprpcd, domain;
-type adsprpcd_exec, exec_type, vendor_file_type, file_type;
+type vendor_adsprpcd, domain;
+type vendor_adsprpcd_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(adsprpcd)
+init_daemon_domain(vendor_adsprpcd)
-allow adsprpcd ion_device:chr_file r_file_perms;
-allow adsprpcd qdsp_device:chr_file r_file_perms;
-allow adsprpcd xdsp_device:chr_file r_file_perms;
+allow vendor_adsprpcd ion_device:chr_file r_file_perms;
+allow vendor_adsprpcd vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_adsprpcd vendor_xdsp_device:chr_file r_file_perms;
-allow adsprpcd system_file:dir r_dir_perms;
+allow vendor_adsprpcd system_file:dir r_dir_perms;
-r_dir_file(adsprpcd, adsprpcd_file)
-get_prop(adsprpcd, vendor_adsprpc_prop)
+r_dir_file(vendor_adsprpcd, adsprpcd_file)
+get_prop(vendor_adsprpcd, vendor_adsprpc_prop)
-allow adsprpcd persist_sensors_file:dir create_dir_perms;
-allow adsprpcd persist_sensors_file:file create_file_perms;
-allow adsprpcd mnt_vendor_file:dir r_dir_perms;
+allow vendor_adsprpcd vendor_persist_sensors_file:dir create_dir_perms;
+allow vendor_adsprpcd vendor_persist_sensors_file:file create_file_perms;
+allow vendor_adsprpcd mnt_vendor_file:dir r_dir_perms;
diff --git a/generic/vendor/common/app.te b/generic/vendor/common/app.te
index d0257d2..8641307 100644
--- a/generic/vendor/common/app.te
+++ b/generic/vendor/common/app.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Allow all apps to open and send ioctl to qdsp device
-allow appdomain qdsp_device:chr_file r_file_perms;
+allow appdomain vendor_qdsp_device:chr_file r_file_perms;
# For the camera app
get_prop(appdomain, vendor_camera_prop)
@@ -35,4 +35,4 @@
get_prop(appdomain, vendor_adsprpc_prop)
# Allow all apps to open and send ioctl to npu device
-allow appdomain npu_device:chr_file r_file_perms;
+allow appdomain vendor_npu_device:chr_file r_file_perms;
diff --git a/generic/vendor/common/atfwd.te b/generic/vendor/common/atfwd.te
index fcd2884..43a11b7 100644
--- a/generic/vendor/common/atfwd.te
+++ b/generic/vendor/common/atfwd.te
@@ -24,20 +24,20 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type atfwd, domain;
-type atfwd_exec, exec_type, vendor_file_type, file_type;
+type vendor_atfwd, domain;
+type vendor_atfwd_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(atfwd)
+init_daemon_domain(vendor_atfwd)
-allow atfwd self:socket create_socket_perms;
-allow atfwd self:qipcrtr_socket create_socket_perms_no_ioctl;
-allowxperm atfwd self:socket ioctl msm_sock_ipc_ioctls;
+allow vendor_atfwd self:socket create_socket_perms;
+allow vendor_atfwd self:qipcrtr_socket create_socket_perms_no_ioctl;
+allowxperm vendor_atfwd self:socket ioctl msm_sock_ipc_ioctls;
-binder_call(atfwd, system_app);
+binder_call(vendor_atfwd, system_app);
-r_dir_file(atfwd, sysfs_data);
+r_dir_file(vendor_atfwd, vendor_sysfs_data);
-set_prop(atfwd, vendor_radio_prop)
+set_prop(vendor_atfwd, vendor_radio_prop)
-hwbinder_use(atfwd)
-get_prop(atfwd, hwservicemanager_prop)
+hwbinder_use(vendor_atfwd)
+get_prop(vendor_atfwd, hwservicemanager_prop)
diff --git a/generic/vendor/common/attributes b/generic/vendor/common/attributes
index 258c03d..0e3d65e 100644
--- a/generic/vendor/common/attributes
+++ b/generic/vendor/common/attributes
@@ -25,41 +25,41 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-attribute hal_hbtp;
-attribute hal_hbtp_client;
-attribute hal_hbtp_server;
+attribute vendor_hal_hbtp;
+attribute vendor_hal_hbtp_client;
+attribute vendor_hal_hbtp_server;
-attribute hal_perf;
-attribute hal_perf_client;
-attribute hal_perf_server;
+attribute vendor_hal_perf;
+attribute vendor_hal_perf_client;
+attribute vendor_hal_perf_server;
-attribute hal_qdutils_disp;
-attribute hal_qdutils_disp_client;
-attribute hal_qdutils_disp_server;
+attribute vendor_hal_qdutils_disp;
+attribute vendor_hal_qdutils_disp_client;
+attribute vendor_hal_qdutils_disp_server;
-attribute hal_trustedui;
-attribute hal_trustedui_client;
-attribute hal_trustedui_server;
+attribute vendor_hal_trustedui;
+attribute vendor_hal_trustedui_client;
+attribute vendor_hal_trustedui_server;
-attribute hal_tui_comm;
-attribute hal_tui_comm_client;
-attribute hal_tui_comm_server;
+attribute vendor_hal_tui_comm;
+attribute vendor_hal_tui_comm_client;
+attribute vendor_hal_tui_comm_server;
-attribute hal_display_color;
-attribute hal_display_color_client;
-attribute hal_display_color_server;
+attribute vendor_hal_display_color;
+attribute vendor_hal_display_color_client;
+attribute vendor_hal_display_color_server;
-attribute hal_display_postproc;
-attribute hal_display_postproc_client;
-attribute hal_display_postproc_server;
+attribute vendor_hal_display_postproc;
+attribute vendor_hal_display_postproc_client;
+attribute vendor_hal_display_postproc_server;
# All types in /mnt/vendor/persist
attribute vendor_persist_type;
-attribute hal_capabilityconfigstore_qti;
-attribute hal_capabilityconfigstore_qti_client;
-attribute hal_capabilityconfigstore_qti_server;
+attribute vendor_hal_capabilityconfigstore_qti;
+attribute vendor_hal_capabilityconfigstore_qti_client;
+attribute vendor_hal_capabilityconfigstore_qti_server;
-attribute hal_dataconnection_qti;
-attribute hal_dataconnection_qti_client;
-attribute hal_dataconnection_qti_server;
+attribute vendor_hal_dataconnection_qti;
+attribute vendor_hal_dataconnection_qti_client;
+attribute vendor_hal_dataconnection_qti_server;
diff --git a/generic/vendor/common/bootanim.te b/generic/vendor/common/bootanim.te
index 5507ab3..2f785d0 100644
--- a/generic/vendor/common/bootanim.te
+++ b/generic/vendor/common/bootanim.te
@@ -32,4 +32,4 @@
# this denial on phones since this functionality is not used.
dontaudit bootanim system_data_file:dir read;
-dontaudit bootanim hal_qspmhal_hwservice:hwservice_manager find;
+dontaudit bootanim vendor_hal_qspmhal_hwservice:hwservice_manager find;
diff --git a/generic/vendor/common/cameraserver.te b/generic/vendor/common/cameraserver.te
index b856d2c..a7b9cd7 100644
--- a/generic/vendor/common/cameraserver.te
+++ b/generic/vendor/common/cameraserver.te
@@ -28,8 +28,8 @@
get_prop(cameraserver, vendor_camera_prop)
-allow cameraserver sysfs_camera:file r_file_perms;
-allow cameraserver sysfs_camera:dir search;
+allow cameraserver vendor_sysfs_camera:file r_file_perms;
+allow cameraserver vendor_sysfs_camera:dir search;
allow cameraserver system_file:dir r_dir_perms;
allow cameraserver system_server:unix_stream_socket { read write };
diff --git a/generic/vendor/common/cdsprpcd.te b/generic/vendor/common/cdsprpcd.te
index c337083..80c1cb7 100644
--- a/generic/vendor/common/cdsprpcd.te
+++ b/generic/vendor/common/cdsprpcd.te
@@ -25,23 +25,23 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# cdsprpcd daemon
-type cdsprpcd, domain;
-type cdsprpcd_exec, exec_type, vendor_file_type, file_type;
+# vendor_cdsprpcd daemon
+type vendor_cdsprpcd, domain;
+type vendor_cdsprpcd_exec, exec_type, vendor_file_type, file_type;
# Started by init
-init_daemon_domain(cdsprpcd)
+init_daemon_domain(vendor_cdsprpcd)
# For reading dir/files on /dsp
-r_dir_file(cdsprpcd, adsprpcd_file)
+r_dir_file(vendor_cdsprpcd, adsprpcd_file)
# For reading adsprpc_prop
-get_prop(cdsprpcd, vendor_adsprpc_prop)
+get_prop(vendor_cdsprpcd, vendor_adsprpc_prop)
-allow cdsprpcd qdsp_device:chr_file r_file_perms;
-allow cdsprpcd xdsp_device:chr_file r_file_perms;
-allow cdsprpcd ion_device:chr_file r_file_perms;
+allow vendor_cdsprpcd vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_cdsprpcd vendor_xdsp_device:chr_file r_file_perms;
+allow vendor_cdsprpcd ion_device:chr_file r_file_perms;
-r_dir_file(cdsprpcd, sysfs_devfreq)
-allow cdsprpcd sysfs_devfreq_l3cdsp:dir r_dir_perms;
-allow cdsprpcd sysfs_devfreq_l3cdsp:file rw_file_perms;
\ No newline at end of file
+r_dir_file(vendor_cdsprpcd, vendor_sysfs_devfreq)
+allow vendor_cdsprpcd vendor_sysfs_devfreq_l3cdsp:dir r_dir_perms;
+allow vendor_cdsprpcd vendor_sysfs_devfreq_l3cdsp:file rw_file_perms;
diff --git a/generic/vendor/common/charger.te b/generic/vendor/common/charger.te
index b6fc4cd..68d82ef 100644
--- a/generic/vendor/common/charger.te
+++ b/generic/vendor/common/charger.te
@@ -25,12 +25,12 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
allow charger self:capability2 wake_alarm;
-r_dir_file(charger, sysfs_battery_supply)
-r_dir_file(charger, sysfs_usb_supply)
+r_dir_file(charger, vendor_sysfs_battery_supply)
+r_dir_file(charger, vendor_sysfs_usb_supply)
allow charger {
- sysfs_battery_supply
- sysfs_usb_supply
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
}:file w_file_perms;
dontaudit charger device:dir r_dir_perms;
diff --git a/generic/vendor/common/chre.te b/generic/vendor/common/chre.te
index 17c019c..5026498 100644
--- a/generic/vendor/common/chre.te
+++ b/generic/vendor/common/chre.te
@@ -27,15 +27,15 @@
# This daemon loads the Context Hub Runtime Environment (CHRE) dynamic modules
# onto the SLPI using FastRPC, and exposes a sockets interface for clients on
# the applications processor to interact CHRE
-type chre, domain;
-type chre_exec, exec_type, vendor_file_type, file_type;
+type vendor_chre, domain;
+type vendor_chre_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(chre)
-r_dir_file(chre, adsprpcd_file)
-#allow chre to read adsprpc_prop
-get_prop(chre, vendor_adsprpc_prop)
+init_daemon_domain(vendor_chre)
+r_dir_file(vendor_chre, adsprpcd_file)
+#allow vendor_chre to read adsprpc_prop
+get_prop(vendor_chre, vendor_adsprpc_prop)
-allow chre ion_device:chr_file r_file_perms;
-allow chre qdsp_device:chr_file r_file_perms;
-allow chre xdsp_device:chr_file r_file_perms;
-allow chre dsp_device:chr_file r_file_perms;
+allow vendor_chre ion_device:chr_file r_file_perms;
+allow vendor_chre vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_chre vendor_xdsp_device:chr_file r_file_perms;
+allow vendor_chre vendor_dsp_device:chr_file r_file_perms;
diff --git a/generic/vendor/common/cnd.te b/generic/vendor/common/cnd.te
index 22c955c..e230659 100644
--- a/generic/vendor/common/cnd.te
+++ b/generic/vendor/common/cnd.te
@@ -24,63 +24,63 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type cnd, domain;
-type cnd_exec, exec_type, vendor_file_type, file_type;
-file_type_auto_trans(cnd, socket_device, cnd_socket);
+type vendor_cnd, domain;
+type vendor_cnd_exec, exec_type, vendor_file_type, file_type;
+file_type_auto_trans(vendor_cnd, socket_device, vendor_cnd_socket);
-# cnd is started by init, type transit from init domain to cnd domain
-init_daemon_domain(cnd)
+# vendor_cnd is started by init, type transit from init domain to vendor_cnd domain
+init_daemon_domain(vendor_cnd)
#communicating with QTI wlan driver for WFC/ VTiWLAN quality
-allow cnd self:capability net_bind_service;
-unix_socket_send(cnd, wpa, hal_wifi_supplicant)
-allow cnd wpa_data_file:dir w_dir_perms;
-allow cnd wpa_data_file:sock_file create_file_perms;
+allow vendor_cnd self:capability net_bind_service;
+unix_socket_send(vendor_cnd, wpa, hal_wifi_supplicant)
+allow vendor_cnd wpa_data_file:dir w_dir_perms;
+allow vendor_cnd wpa_data_file:sock_file create_file_perms;
#allow processing of VoWifi indications from modem over QMI while dozing
-allow cnd self:capability2 block_suspend;
+allow vendor_cnd self:capability2 block_suspend;
-allow cnd self:udp_socket create_socket_perms;
-allow cnd self:{
+allow vendor_cnd self:udp_socket create_socket_perms;
+allow vendor_cnd self:{
# Allow receiving NETLINK responses from WLAN driver.
netlink_socket
netlink_generic_socket
qipcrtr_socket
} create_socket_perms_no_ioctl;
-allowxperm cnd self:udp_socket ioctl SIOCGIFMTU;
+allowxperm vendor_cnd self:udp_socket ioctl SIOCGIFMTU;
-allow cnd sysfs_timestamp_switch:file r_file_perms;
-allow cnd sysfs_data:file r_file_perms;
+allow vendor_cnd vendor_sysfs_timestamp_switch:file r_file_perms;
+allow vendor_cnd vendor_sysfs_data:file r_file_perms;
-allow cnd proc_meminfo:file r_file_perms;
+allow vendor_cnd proc_meminfo:file r_file_perms;
-set_prop(cnd, cnd_prop)
+set_prop(vendor_cnd, vendor_cnd_prop)
-# allow cnd to access cnd_data_file
-allow cnd cnd_data_file:file create_file_perms;
-allow cnd cnd_data_file:sock_file { unlink create setattr };
-allow cnd cnd_data_file:dir rw_dir_perms;
+# allow vendor_cnd to access vendor_cnd_data_file
+allow vendor_cnd vendor_cnd_data_file:file create_file_perms;
+allow vendor_cnd vendor_cnd_data_file:sock_file { unlink create setattr };
+allow vendor_cnd vendor_cnd_data_file:dir rw_dir_perms;
-# allow cnd to obtain wakelock
-wakelock_use(cnd)
+# allow vendor_cnd to obtain wakelock
+wakelock_use(vendor_cnd)
-allow cnd ipa_vendor_data_file:dir r_dir_perms;
-allow cnd ipa_vendor_data_file:file r_file_perms;
+allow vendor_cnd vendor_ipa_vendor_data_file:dir r_dir_perms;
+allow vendor_cnd vendor_ipa_vendor_data_file:file r_file_perms;
-# To register cnd to hwbinder
-add_hwservice(cnd, hal_datafactory_hwservice)
-hwbinder_use(cnd)
-get_prop(cnd, hwservicemanager_prop)
-binder_call(cnd, dataservice_app)
-binder_call(cnd, qtidataservices_app)
-binder_call(cnd, ims)
-binder_call(cnd, location)
+# To register vendor_cnd to hwbinder
+add_hwservice(vendor_cnd, vendor_hal_datafactory_hwservice)
+hwbinder_use(vendor_cnd)
+get_prop(vendor_cnd, hwservicemanager_prop)
+binder_call(vendor_cnd, dataservice_app)
+binder_call(vendor_cnd, vendor_qtidataservices_app)
+binder_call(vendor_cnd, vendor_ims)
+binder_call(vendor_cnd, vendor_location)
-r_dir_file(cnd, sysfs_ssr)
+r_dir_file(vendor_cnd, vendor_sysfs_ssr)
#diag
userdebug_or_eng(`
- diag_use(cnd)
- r_dir_file(cnd, sysfs_diag)
+ diag_use(vendor_cnd)
+ r_dir_file(vendor_cnd, vendor_sysfs_diag)
')
diff --git a/generic/vendor/common/dataservice_app.te b/generic/vendor/common/dataservice_app.te
index dc6b1b0..70857f0 100644
--- a/generic/vendor/common/dataservice_app.te
+++ b/generic/vendor/common/dataservice_app.te
@@ -25,14 +25,14 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-get_prop(dataservice_app, cnd_prop)
+get_prop(dataservice_app, vendor_cnd_prop)
-allow dataservice_app hal_imsrcsd_hwservice:hwservice_manager find;
-allow dataservice_app hal_datafactory_hwservice:hwservice_manager find;
+allow dataservice_app vendor_hal_imsrcsd_hwservice:hwservice_manager find;
+allow dataservice_app vendor_hal_datafactory_hwservice:hwservice_manager find;
-allow dataservice_app sysfs_data:file r_file_perms;
+allow dataservice_app vendor_sysfs_data:file r_file_perms;
-binder_call(dataservice_app, cnd)
+binder_call(dataservice_app, vendor_cnd)
# imsrcsd to bind with UceShimService.apk
-binder_call(dataservice_app, hal_rcsservice)
\ No newline at end of file
+binder_call(dataservice_app, vendor_hal_rcsservice)
diff --git a/generic/vendor/common/device.te b/generic/vendor/common/device.te
index 124a959..78d13d9 100644
--- a/generic/vendor/common/device.te
+++ b/generic/vendor/common/device.te
@@ -24,42 +24,42 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type ab_block_device, dev_type;
-type at_device, dev_type;
-type avtimer_device, dev_type;
-type bt_device, dev_type;
-type bu21150_device, dev_type;
-type citadel_device, dev_type;
-type custom_ab_block_device, dev_type;
-type diag_device, dev_type, mlstrustedobject;
-type dsp_device, dev_type;
-type xdsp_device, dev_type;
-type easel_device, dev_type;
-type hbtp_device, dev_type;
-type hvdcp_device, dev_type;
-type ipa_dev, dev_type;
-type latency_device, dev_type;
-type limits_block_device, dev_type;
-type modem_block_device, dev_type;
-type modem_efs_partition_device, dev_type;
-type mdtp_device, dev_type;
-type persist_block_device, dev_type;
-type qsee_ipc_irq_spss_device, dev_type;
-type qdsp_device, dev_type, mlstrustedobject;
-type ramdump_device, dev_type;
-type rmnet_device, dev_type;
-type gpt_block_device, dev_type;
-type ramdump_block_device, dev_type;
-type rpmb_device, dev_type;
-type seemplog_device, dev_type;
-type sg_device, dev_type;
-type smd_device, dev_type;
-type spcom_device, dev_type;
-type ssd_block_device, dev_type;
-type ssr_device, dev_type;
-type synx_device, dev_type;
-type wlan_device, dev_type;
-type xbl_block_device, dev_type;
-type uefi_block_device, dev_type;
-type qce_device, dev_type;
-type npu_device, dev_type;
+type vendor_ab_block_device, dev_type;
+type vendor_at_device, dev_type;
+type vendor_avtimer_device, dev_type;
+type vendor_bt_device, dev_type;
+type vendor_bu21150_device, dev_type;
+type vendor_citadel_device, dev_type;
+type vendor_custom_ab_block_device, dev_type;
+type vendor_diag_device, dev_type, mlstrustedobject;
+type vendor_dsp_device, dev_type;
+type vendor_xdsp_device, dev_type;
+type vendor_easel_device, dev_type;
+type vendor_hbtp_device, dev_type;
+type vendor_hvdcp_device, dev_type;
+type vendor_ipa_dev, dev_type;
+type vendor_latency_device, dev_type;
+type vendor_limits_block_device, dev_type;
+type vendor_modem_block_device, dev_type;
+type vendor_modem_efs_partition_device, dev_type;
+type vendor_mdtp_device, dev_type;
+type vendor_persist_block_device, dev_type;
+type vendor_qsee_ipc_irq_spss_device, dev_type;
+type vendor_qdsp_device, dev_type, mlstrustedobject;
+type vendor_ramdump_device, dev_type;
+type vendor_rmnet_device, dev_type;
+type vendor_gpt_block_device, dev_type;
+type vendor_ramdump_block_device, dev_type;
+type vendor_rpmb_device, dev_type;
+type vendor_seemplog_device, dev_type;
+type vendor_sg_device, dev_type;
+type vendor_smd_device, dev_type;
+type vendor_spcom_device, dev_type;
+type vendor_ssd_block_device, dev_type;
+type vendor_ssr_device, dev_type;
+type vendor_synx_device, dev_type;
+type vendor_wlan_device, dev_type;
+type vendor_xbl_block_device, dev_type;
+type vendor_uefi_block_device, dev_type;
+type vendor_qce_device, dev_type;
+type vendor_npu_device, dev_type;
diff --git a/generic/vendor/common/diag.te b/generic/vendor/common/diag.te
index bb790bb..02a9edf 100644
--- a/generic/vendor/common/diag.te
+++ b/generic/vendor/common/diag.te
@@ -24,47 +24,47 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type diag, domain;
-type diag_exec, exec_type, vendor_file_type, file_type;
+type vendor_diag, domain;
+type vendor_diag_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
- domain_auto_trans(shell, diag_exec, diag)
- #domain_auto_trans(adbd, diag_exec, diag)
- allow diag {
- diag_device
+ domain_auto_trans(shell, vendor_diag_exec, vendor_diag)
+ #domain_auto_trans(adbd, vendor_diag_exec, vendor_diag)
+ allow vendor_diag {
+ vendor_diag_device
devpts
tty_device
# allow access to qseecom for drmdiagapp
tee_device
}:chr_file rw_file_perms;
- allow diag {
+ allow vendor_diag {
shell
su
}:fd use;
- allow diag {
+ allow vendor_diag {
cgroup
fuse
- persist_drm_file
+ vendor_persist_drm_file
}:dir create_dir_perms;
- allow diag port:tcp_socket name_connect;
- allow diag self:capability { setuid net_raw sys_admin setgid };
- allow diag self:capability2 syslog;
- allow diag self:tcp_socket { create connect setopt};
- wakelock_use(diag)
- allow diag kernel:system syslog_mod;
+ allow vendor_diag port:tcp_socket name_connect;
+ allow vendor_diag self:capability { setuid net_raw sys_admin setgid };
+ allow vendor_diag self:capability2 syslog;
+ allow vendor_diag self:tcp_socket { create connect setopt};
+ wakelock_use(vendor_diag)
+ allow vendor_diag kernel:system syslog_mod;
# allow drmdiagapp access to drm related paths
- allow diag mnt_vendor_file:dir r_dir_perms;
- r_dir_file(diag, persist_data_file)
+ allow vendor_diag mnt_vendor_file:dir r_dir_perms;
+ r_dir_file(vendor_diag, vendor_persist_data_file)
# Write to drm related pieces of persist partition
- allow diag persist_drm_file:file create_file_perms;
+ allow vendor_diag vendor_persist_drm_file:file create_file_perms;
# For DiagExample daemon
- init_daemon_domain(diag)
- net_domain(diag)
+ init_daemon_domain(vendor_diag)
+ net_domain(vendor_diag)
- allow diag fuse:dir r_dir_perms;
- allow diag fuse:file r_file_perms;
- r_dir_file(diag, storage_file)
- r_dir_file(diag, mnt_user_file)
+ allow vendor_diag fuse:dir r_dir_perms;
+ allow vendor_diag fuse:file r_file_perms;
+ r_dir_file(vendor_diag, storage_file)
+ r_dir_file(vendor_diag, mnt_user_file)
')
diff --git a/generic/vendor/common/domain.te b/generic/vendor/common/domain.te
index 0863c1b..fee30ce 100644
--- a/generic/vendor/common/domain.te
+++ b/generic/vendor/common/domain.te
@@ -25,25 +25,25 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
userdebug_or_eng(`
- allow domain diag_device:chr_file rw_file_perms;
+ allow domain vendor_diag_device:chr_file rw_file_perms;
')
# In order for /sys/kernel/debug/kgsl/proc/<pid>/mem
# to be created for memory tracking, the domain of
# the tracked process must have permission to search
# in /sys/kernel/debug/kgsl
-allow domain debugfs_kgsl:dir search;
+allow domain vendor_debugfs_kgsl:dir search;
-allow domain debugfs_ion:dir search;
+allow domain vendor_debugfs_ion:dir search;
get_prop(domain, vendor_gralloc_prop)
-r_dir_file({domain - isolated_app}, sysfs_soc);
-r_dir_file({domain - isolated_app}, sysfs_esoc);
-r_dir_file({domain - isolated_app}, sysfs_ssr);
+r_dir_file({domain - isolated_app}, vendor_sysfs_soc);
+r_dir_file({domain - isolated_app}, vendor_sysfs_esoc);
+r_dir_file({domain - isolated_app}, vendor_sysfs_ssr);
r_dir_file({domain - isolated_app}, sysfs_thermal);
-get_prop(domain, public_vendor_default_prop)
+get_prop(domain, vendor_public_vendor_default_prop)
dontaudit domain kernel:system module_request;
diff --git a/generic/vendor/common/fastbootd.te b/generic/vendor/common/fastbootd.te
index fcd7f93..bef55ff 100644
--- a/generic/vendor/common/fastbootd.te
+++ b/generic/vendor/common/fastbootd.te
@@ -28,12 +28,12 @@
#Allow fastbootd
recovery_only(`
allow fastbootd {
- custom_ab_block_device
+ vendor_custom_ab_block_device
recovery_block_device
- xbl_block_device
- uefi_block_device
- ssd_block_device
- modem_block_device
- mdtp_device
+ vendor_xbl_block_device
+ vendor_uefi_block_device
+ vendor_ssd_block_device
+ vendor_modem_block_device
+ vendor_mdtp_device
}:blk_file { rw_file_perms };
')
diff --git a/generic/vendor/common/feature_enabler_client.te b/generic/vendor/common/feature_enabler_client.te
index 351a96e..ab66cbf 100644
--- a/generic/vendor/common/feature_enabler_client.te
+++ b/generic/vendor/common/feature_enabler_client.te
@@ -25,22 +25,22 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type feature_enabler_client, domain;
-type feature_enabler_client_exec, exec_type, vendor_file_type, file_type;
+type vendor_feature_enabler_client, domain;
+type vendor_feature_enabler_client_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(feature_enabler_client)
-allow feature_enabler_client tee_device:chr_file rw_file_perms;
-allow feature_enabler_client ion_device:chr_file rw_file_perms;
-unix_socket_connect(feature_enabler_client , ssgtzd, ssgtzd)
+init_daemon_domain(vendor_feature_enabler_client)
+allow vendor_feature_enabler_client tee_device:chr_file rw_file_perms;
+allow vendor_feature_enabler_client ion_device:chr_file rw_file_perms;
+unix_socket_connect(vendor_feature_enabler_client , vendor_ssgtzd, vendor_ssgtzd)
-# Allow read permission to /mnt/vendor/persist/feature_enabler_client/*
-allow feature_enabler_client mnt_vendor_file:dir search;
-r_dir_file(feature_enabler_client, persist_feature_enabler_file)
+# Allow read permission to /mnt/vendor/persist/vendor_feature_enabler_client/*
+allow vendor_feature_enabler_client mnt_vendor_file:dir search;
+r_dir_file(vendor_feature_enabler_client, vendor_persist_feature_enabler_file)
# Allow read permission to /mnt/vendor/persist/data/*
-r_dir_file(feature_enabler_client, persist_data_file)
+r_dir_file(vendor_feature_enabler_client, vendor_persist_data_file)
# Binder access for featenab_client.service
-vndbinder_use(feature_enabler_client)
-allow feature_enabler_client qfeatenab_client_service:service_manager { add find };
+vndbinder_use(vendor_feature_enabler_client)
+allow vendor_feature_enabler_client vendor_qfeatenab_client_service:service_manager { add find };
diff --git a/generic/vendor/common/file.te b/generic/vendor/common/file.te
index 07f1217..b694210 100644
--- a/generic/vendor/common/file.te
+++ b/generic/vendor/common/file.te
@@ -24,123 +24,123 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sysfs_audio, fs_type, sysfs_type;
-type sysfs_battery_supply, sysfs_type, fs_type;
-type sysfs_bond0, fs_type, sysfs_type;
-type sysfs_boot_adsp, sysfs_type, fs_type;
-type sysfs_camera, sysfs_type, fs_type;
-type sysfs_cpu_boost, fs_type, sysfs_type;
-type sysfs_devfreq, fs_type, sysfs_type;
-type sysfs_easel, sysfs_type, fs_type;
-type sysfs_esoc, sysfs_type, fs_type;
-type sysfs_fingerprint, sysfs_type, fs_type;
-type sysfs_graphics, sysfs_type, fs_type;
-type sysfs_kgsl, sysfs_type, fs_type;
-type sysfs_kgsl_proc, sysfs_type, fs_type;
-type hbtp_kernel_sysfs, sysfs_type, fs_type;
-type sysfs_irqbalance, sysfs_type, fs_type;
-type sysfs_laser, sysfs_type, fs_type;
-type sysfs_mdss_mdp_caps, sysfs_type, fs_type;
-type sysfs_devfreq_l3cdsp, fs_type, sysfs_type;
-type sysfs_mmc_host, fs_type, sysfs_type;
-type sysfs_msm_perf, fs_type, sysfs_type;
-type sysfs_msm_power, fs_type, sysfs_type;
-type sysfs_msm_stats, fs_type, sysfs_type;
-type sysfs_msm_subsys_restart, sysfs_type, fs_type;
-type sysfs_sensors, sysfs_type, fs_type;
-type sysfs_sectouch, sysfs_type, fs_type;
-type sysfs_soc, sysfs_type, fs_type;
-type sysfs_scsi_host, fs_type, sysfs_type;
-type sysfs_scsi_target, fs_type, sysfs_type;
-type sysfs_slpi, fs_type, sysfs_type;
-type sysfs_spmi_dev, sysfs_type, fs_type;
-type sysfs_ssr, sysfs_type, fs_type;
-type sysfs_ssr_toggle, sysfs_type, fs_type;
-type sysfs_timestamp_switch, sysfs_type, fs_type;
-type sysfs_touch, sysfs_type, fs_type;
-type sysfs_uio_file, sysfs_type, fs_type;
-type sysfs_usb_c, sysfs_type, fs_type;
-type sysfs_usb_device, sysfs_type, fs_type;
-type sysfs_usb_supply, sysfs_type, fs_type;
-type sysfs_usbpd_device, sysfs_type, fs_type;
-type sysfs_vadc_dev, sysfs_type, fs_type;
-type sysfs_lcd, sysfs_type, fs_type;
-type sysfs_adsp_ssr, sysfs_type, fs_type;
+type vendor_sysfs_audio, fs_type, sysfs_type;
+type vendor_sysfs_battery_supply, sysfs_type, fs_type;
+type vendor_sysfs_bond0, fs_type, sysfs_type;
+type vendor_sysfs_boot_adsp, sysfs_type, fs_type;
+type vendor_sysfs_camera, sysfs_type, fs_type;
+type vendor_sysfs_cpu_boost, fs_type, sysfs_type;
+type vendor_sysfs_devfreq, fs_type, sysfs_type;
+type vendor_sysfs_easel, sysfs_type, fs_type;
+type vendor_sysfs_esoc, sysfs_type, fs_type;
+type vendor_sysfs_fingerprint, sysfs_type, fs_type;
+type vendor_sysfs_graphics, sysfs_type, fs_type;
+type vendor_sysfs_kgsl, sysfs_type, fs_type;
+type vendor_sysfs_kgsl_proc, sysfs_type, fs_type;
+type vendor_hbtp_kernel_sysfs, sysfs_type, fs_type;
+type vendor_sysfs_irqbalance, sysfs_type, fs_type;
+type vendor_sysfs_laser, sysfs_type, fs_type;
+type vendor_sysfs_mdss_mdp_caps, sysfs_type, fs_type;
+type vendor_sysfs_devfreq_l3cdsp, fs_type, sysfs_type;
+type vendor_sysfs_mmc_host, fs_type, sysfs_type;
+type vendor_sysfs_msm_perf, fs_type, sysfs_type;
+type vendor_sysfs_msm_power, fs_type, sysfs_type;
+type vendor_sysfs_msm_stats, fs_type, sysfs_type;
+type vendor_sysfs_msm_subsys_restart, sysfs_type, fs_type;
+type vendor_sysfs_sensors, sysfs_type, fs_type;
+type vendor_sysfs_sectouch, sysfs_type, fs_type;
+type vendor_sysfs_soc, sysfs_type, fs_type;
+type vendor_sysfs_scsi_host, fs_type, sysfs_type;
+type vendor_sysfs_scsi_target, fs_type, sysfs_type;
+type vendor_sysfs_slpi, fs_type, sysfs_type;
+type vendor_sysfs_spmi_dev, sysfs_type, fs_type;
+type vendor_sysfs_ssr, sysfs_type, fs_type;
+type vendor_sysfs_ssr_toggle, sysfs_type, fs_type;
+type vendor_sysfs_timestamp_switch, sysfs_type, fs_type;
+type vendor_sysfs_touch, sysfs_type, fs_type;
+type vendor_sysfs_uio_file, sysfs_type, fs_type;
+type vendor_sysfs_usb_c, sysfs_type, fs_type;
+type vendor_sysfs_usb_device, sysfs_type, fs_type;
+type vendor_sysfs_usb_supply, sysfs_type, fs_type;
+type vendor_sysfs_usbpd_device, sysfs_type, fs_type;
+type vendor_sysfs_vadc_dev, sysfs_type, fs_type;
+type vendor_sysfs_lcd, sysfs_type, fs_type;
+type vendor_sysfs_adsp_ssr, sysfs_type, fs_type;
-type debugfs_clk, debugfs_type, fs_type;
-type debugfs_ion, debugfs_type, fs_type;
-type debugfs_ipc, debugfs_type, fs_type;
-type debugfs_kgsl, debugfs_type, fs_type;
-type debugfs_rpm, debugfs_type, fs_type;
-type debugfs_rmt_storage, debugfs_type, fs_type;
-type debugfs_usb, debugfs_type, fs_type;
-type debugfs_wlan, debugfs_type, fs_type;
-type debugfs_mdp, debugfs_type, fs_type;
-type debugfs_icnss, debugfs_type, fs_type;
+type vendor_debugfs_clk, debugfs_type, fs_type;
+type vendor_debugfs_ion, debugfs_type, fs_type;
+type vendor_debugfs_ipc, debugfs_type, fs_type;
+type vendor_debugfs_kgsl, debugfs_type, fs_type;
+type vendor_debugfs_rpm, debugfs_type, fs_type;
+type vendor_debugfs_rmt_storage, debugfs_type, fs_type;
+type vendor_debugfs_usb, debugfs_type, fs_type;
+type vendor_debugfs_wlan, debugfs_type, fs_type;
+type vendor_debugfs_mdp, debugfs_type, fs_type;
+type vendor_debugfs_icnss, debugfs_type, fs_type;
# /proc
-type proc_wifi_dbg, fs_type, proc_type;
-type proc_audiod, fs_type, proc_type;
+type vendor_proc_wifi_dbg, fs_type, proc_type;
+type vendor_proc_audiod, fs_type, proc_type;
-type qmuxd_socket, file_type;
-type netmgrd_socket, file_type;
-type port-bridge_socket, file_type;
-type thermal_socket, file_type;
+type vendor_qmuxd_socket, file_type;
+type vendor_netmgrd_socket, file_type;
+type vendor_port-bridge_socket, file_type;
+type vendor_thermal_socket, file_type;
#Define the qti socket type
-type dataqti_socket, file_type;
+type vendor_dataqti_socket, file_type;
-type ims_socket, file_type;
-type ipacm_socket, file_type;
-type cnd_socket, file_type;
-type chre_socket, file_type;
-type hal_bootctl_socket, file_type;
-type location_socket, file_type;
-type wifihal_socket, file_type;
-type pps_socket, file_type;
+type vendor_ims_socket, file_type;
+type vendor_ipacm_socket, file_type;
+type vendor_cnd_socket, file_type;
+type vendor_chre_socket, file_type;
+type vendor_hal_bootctl_socket, file_type;
+type vendor_location_socket, file_type;
+type vendor_wifihal_socket, file_type;
+type vendor_pps_socket, file_type;
# imshelper_app file types
-type imshelper_app_data_file, file_type, data_file_type;
+type vendor_imshelper_app_data_file, file_type, data_file_type;
type firmware_file, file_type, contextmount_type, vendor_file_type;
-type cnd_data_file, file_type, data_file_type;
-type location_data_file, file_type, data_file_type;
+type vendor_cnd_data_file, file_type, data_file_type;
+type vendor_location_data_file, file_type, data_file_type;
type vendor_audio_data_file, file_type, data_file_type;
type vendor_radio_data_file, file_type, data_file_type;
-type wifi_vendor_log_data_file, file_type, data_file_type;
+type vendor_wifi_vendor_log_data_file, file_type, data_file_type;
# for mount /persist
typeattribute mnt_vendor_file vendor_persist_type;
-type persist_file, file_type, vendor_persist_type;
-type persist_data_file, file_type , vendor_persist_type;
-type persist_display_file, file_type;
-type persist_drm_file, file_type, vendor_persist_type;
-type persist_elabel_file, file_type, vendor_persist_type;
-type persist_haptics_file, file_type, vendor_persist_type;
-type persist_rfs_file, file_type, vendor_persist_type;
-type persist_rfs_shared_hlos_file, file_type, vendor_persist_type;
-type persist_sensors_file, file_type, vendor_persist_type;
-type persist_time_file, file_type, vendor_persist_type;
-type persist_audio_file, file_type, vendor_persist_type;
-type persist_bluetooth_file, file_type, vendor_persist_type;
-type persist_alarm_file, file_type, vendor_persist_type;
-type persist_feature_enabler_file, file_type, vendor_persist_type;
+type vendor_persist_file, file_type, vendor_persist_type;
+type vendor_persist_data_file, file_type , vendor_persist_type;
+type vendor_persist_display_file, file_type;
+type vendor_persist_drm_file, file_type, vendor_persist_type;
+type vendor_persist_elabel_file, file_type, vendor_persist_type;
+type vendor_persist_haptics_file, file_type, vendor_persist_type;
+type vendor_persist_rfs_file, file_type, vendor_persist_type;
+type vendor_persist_rfs_shared_hlos_file, file_type, vendor_persist_type;
+type vendor_persist_sensors_file, file_type, vendor_persist_type;
+type vendor_persist_time_file, file_type, vendor_persist_type;
+type vendor_persist_audio_file, file_type, vendor_persist_type;
+type vendor_persist_bluetooth_file, file_type, vendor_persist_type;
+type vendor_persist_alarm_file, file_type, vendor_persist_type;
+type vendor_persist_feature_enabler_file, file_type, vendor_persist_type;
-type netmgr_data_file, file_type, data_file_type;
-type netmgr_recovery_data_file, file_type, data_file_type;
-type ipa_vendor_data_file, file_type, data_file_type;
+type vendor_netmgr_data_file, file_type, data_file_type;
+type vendor_netmgr_recovery_data_file, file_type, data_file_type;
+type vendor_ipa_vendor_data_file, file_type, data_file_type;
type vendor_tombstone_data_file, file_type, data_file_type;
type vendor_camera_data_file, file_type, data_file_type;
-type display_vendor_data_file, file_type, data_file_type;
-type nfc_vendor_data_file, file_type, data_file_type;
-type radio_vendor_data_file, file_type, data_file_type, mlstrustedobject;
-type ramdump_vendor_data_file, file_type, data_file_type, mlstrustedobject;
-type modem_dump_file, file_type, data_file_type;
-type sensors_vendor_data_file, file_type, data_file_type;
-type port_bridge_data_file, file_type, data_file_type;
-type vendor_firmware_file, vendor_file_type, file_type;
+type vendor_display_vendor_data_file, file_type, data_file_type;
+type vendor_nfc_vendor_data_file, file_type, data_file_type;
+type vendor_radio_vendor_data_file, file_type, data_file_type, mlstrustedobject;
+type vendor_ramdump_vendor_data_file, file_type, data_file_type, mlstrustedobject;
+type vendor_modem_dump_file, file_type, data_file_type;
+type vendor_sensors_vendor_data_file, file_type, data_file_type;
+type vendor_port_bridge_data_file, file_type, data_file_type;
type bt_firmware_file, file_type, contextmount_type, vendor_file_type;
+type vendor_firmware_file, vendor_file_type, file_type;
type vendor_mdmhelperdata_data_file, file_type, data_file_type;
type vendor_mbn_data_file, file_type, data_file_type;
@@ -148,52 +148,52 @@
type vendor_capabilityconfigstore_data_file, file_type, data_file_type;
#widevine data file
-type mediadrm_vendor_data_file, file_type, data_file_type;
+type vendor_mediadrm_vendor_data_file, file_type, data_file_type;
#time-services data file
type vendor_time_data_file, file_type, data_file_type;
#data sysfs files
-type sysfs_data, fs_type, sysfs_type;
+type vendor_sysfs_data, fs_type, sysfs_type;
#diag sysfs files
-type sysfs_diag, fs_type, sysfs_type;
+type vendor_sysfs_diag, fs_type, sysfs_type;
-type hexagon_halide_file, vendor_file_type, file_type;
+type vendor_hexagon_halide_file, vendor_file_type, file_type;
# vendor media files
type vendor_media_data_file, file_type, data_file_type;
type adsprpcd_file, file_type, mlstrustedobject, vendor_file_type;
-type hbtp_log_file, file_type, data_file_type;
-type hbtp_cfg_file, file_type, vendor_file_type;
+type vendor_hbtp_log_file, file_type, data_file_type;
+type vendor_hbtp_cfg_file, file_type, vendor_file_type;
#tloc data files
-type tlocd_data_file, file_type, data_file_type;
+type vendor_tlocd_data_file, file_type, data_file_type;
#qseecom
-type data_qsee_file, file_type, data_file_type;
+type vendor_data_qsee_file, file_type, data_file_type;
#TUI Files
type vendor_tui_data_file, file_type, data_file_type;
# SFS listener data file
-type data_tzstorage_file, file_type, data_file_type;
+type vendor_data_tzstorage_file, file_type, data_file_type;
#NNHAL files
-type hal_neuralnetworks_data_file, file_type, data_file_type;
+type vendor_hal_neuralnetworks_data_file, file_type, data_file_type;
#BT Files
type vendor_bt_data_file, file_type, data_file_type;
-type sysfs_usb_controller, sysfs_type, fs_type;
+type vendor_sysfs_usb_controller, sysfs_type, fs_type;
#for qdss
-type sysfs_qdss_dev, sysfs_type, fs_type;
+type vendor_sysfs_qdss_dev, sysfs_type, fs_type;
#Define the qdcmss socket type
-type qdcmsocket_socket, file_type;
-type sysfs_mhi, sysfs_type, fs_type;
+type vendor_qdcmsocket_socket, file_type;
+type vendor_sysfs_mhi, sysfs_type, fs_type;
-type sysfs_suspend, fs_type, sysfs_type;
+type vendor_sysfs_suspend, fs_type, sysfs_type;
diff --git a/generic/vendor/common/file_contexts b/generic/vendor/common/file_contexts
index 8b8424e..2b40f86 100644
--- a/generic/vendor/common/file_contexts
+++ b/generic/vendor/common/file_contexts
@@ -25,83 +25,83 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# dev nodes
-/dev/btpower u:object_r:bt_device:s0
-/dev/diag u:object_r:diag_device:s0
+/dev/btpower u:object_r:vendor_bt_device:s0
+/dev/diag u:object_r:vendor_diag_device:s0
/dev/kgsl-3d0 u:object_r:gpu_device:s0
/dev/rtc0 u:object_r:rtc_device:s0
-/dev/smd.* u:object_r:smd_device:s0
-/dev/msm_npu u:object_r:npu_device:s0
+/dev/smd.* u:object_r:vendor_smd_device:s0
+/dev/msm_npu u:object_r:vendor_npu_device:s0
# TODO: does ttyMSM0 need to be more specific
/dev/ttyMSM0 u:object_r:tty_device:s0
-/dev/ipa u:object_r:ipa_dev:s0
-/dev/wwan_ioctl u:object_r:ipa_dev:s0
-/dev/ipaNatTable u:object_r:ipa_dev:s0
-/dev/cpu_dma_latency u:object_r:latency_device:s0
-/dev/dpl_ctrl u:object_r:rmnet_device:s0
-/dev/rmnet_ctrl.* u:object_r:rmnet_device:s0
-/dev/at_.* u:object_r:at_device:s0
+/dev/ipa u:object_r:vendor_ipa_dev:s0
+/dev/wwan_ioctl u:object_r:vendor_ipa_dev:s0
+/dev/ipaNatTable u:object_r:vendor_ipa_dev:s0
+/dev/cpu_dma_latency u:object_r:vendor_latency_device:s0
+/dev/dpl_ctrl u:object_r:vendor_rmnet_device:s0
+/dev/rmnet_ctrl.* u:object_r:vendor_rmnet_device:s0
+/dev/at_.* u:object_r:vendor_at_device:s0
/dev/video([0-9])+ u:object_r:video_device:s0
/dev/cvp* u:object_r:video_device:s0
/dev/media([0-9])+ u:object_r:video_device:s0
/dev/v4l-subdev.* u:object_r:video_device:s0
/dev/qseecom u:object_r:tee_device:s0
-/dev/qsee_ipc_irq_spss u:object_r:qsee_ipc_irq_spss_device:s0
-/dev/seemplog u:object_r:seemplog_device:s0
-/dev/spcom u:object_r:spcom_device:s0
+/dev/qsee_ipc_irq_spss u:object_r:vendor_qsee_ipc_irq_spss_device:s0
+/dev/seemplog u:object_r:vendor_seemplog_device:s0
+/dev/spcom u:object_r:vendor_spcom_device:s0
/dev/jpeg[0-9]* u:object_r:video_device:s0
-/dev/adsprpc-smd u:object_r:qdsp_device:s0
-/dev/adsprpc-smd-secure u:object_r:xdsp_device:s0
-/dev/sdsprpc-smd u:object_r:dsp_device:s0
+/dev/adsprpc-smd u:object_r:vendor_qdsp_device:s0
+/dev/adsprpc-smd-secure u:object_r:vendor_xdsp_device:s0
+/dev/sdsprpc-smd u:object_r:vendor_dsp_device:s0
/dev/wcd-dsp-glink u:object_r:audio_device:s0
/dev/wcd_dsp0_control u:object_r:audio_device:s0
/dev/wcd-spi-ac-client u:object_r:audio_device:s0
/dev/msm_.* u:object_r:audio_device:s0
-/dev/avtimer u:object_r:avtimer_device:s0
-/dev/subsys_.* u:object_r:ssr_device:s0
-/dev/ramdump_.* u:object_r:ramdump_device:s0
-/dev/hbtp_input u:object_r:hbtp_device:s0
-/dev/hbtp_vm u:object_r:hbtp_device:s0
-/dev/sg[0-9]+ u:object_r:sg_device:s0
+/dev/avtimer u:object_r:vendor_avtimer_device:s0
+/dev/subsys_.* u:object_r:vendor_ssr_device:s0
+/dev/ramdump_.* u:object_r:vendor_ramdump_device:s0
+/dev/hbtp_input u:object_r:vendor_hbtp_device:s0
+/dev/hbtp_vm u:object_r:vendor_hbtp_device:s0
+/dev/sg[0-9]+ u:object_r:vendor_sg_device:s0
/dev/sensors u:object_r:sensors_device:s0
-/dev/mnh_sm u:object_r:easel_device:s0
-/dev/easelcomm-client u:object_r:easel_device:s0
-/dev/citadel0 u:object_r:citadel_device:s0
-/dev/jdi-bu21150 u:object_r:bu21150_device:s0
-/dev/usb_ext_chg u:object_r:hvdcp_device:s0
-/dev/synx_device u:object_r:synx_device:s0
-/dev/ipa_odl_ctl u:object_r:ipa_dev:s0
-/dev/ipa_adpl u:object_r:ipa_dev:s0
+/dev/mnh_sm u:object_r:vendor_easel_device:s0
+/dev/easelcomm-client u:object_r:vendor_easel_device:s0
+/dev/citadel0 u:object_r:vendor_citadel_device:s0
+/dev/jdi-bu21150 u:object_r:vendor_bu21150_device:s0
+/dev/usb_ext_chg u:object_r:vendor_hvdcp_device:s0
+/dev/synx_device u:object_r:vendor_synx_device:s0
+/dev/ipa_odl_ctl u:object_r:vendor_ipa_dev:s0
+/dev/ipa_adpl u:object_r:vendor_ipa_dev:s0
# dev socket nodes
-/dev/socket/chre u:object_r:chre_socket:s0
-/dev/socket/oemlock u:object_r:hal_bootctl_socket:s0
-/dev/socket/ims_qmid u:object_r:ims_socket:s0
-/dev/socket/ims_datad u:object_r:ims_socket:s0
-/dev/socket/ipacm_log_file u:object_r:ipacm_socket:s0
-/dev/socket/cnd u:object_r:cnd_socket:s0
-/dev/socket/thermal-send-client u:object_r:thermal_socket:s0
-/dev/socket/thermal-recv-client u:object_r:thermal_socket:s0
-/dev/socket/thermal-recv-passive-client u:object_r:thermal_socket:s0
-/dev/socket/thermal-send-rule u:object_r:thermal_socket:s0
-/dev/socket/netmgr(/.*)? u:object_r:netmgrd_socket:s0
-/dev/socket/port-bridge(/.*)? u:object_r:port-bridge_socket:s0
-/dev/socket/qti_dpm_uds_file u:object_r:dataqti_socket:s0
-/dev/socket/location(/.*)? u:object_r:location_socket:s0
-/dev/socket/wifihal(/.*)? u:object_r:wifihal_socket:s0
-/dev/socket/pps u:object_r:pps_socket:s0
+/dev/socket/chre u:object_r:vendor_chre_socket:s0
+/dev/socket/oemlock u:object_r:vendor_hal_bootctl_socket:s0
+/dev/socket/ims_qmid u:object_r:vendor_ims_socket:s0
+/dev/socket/ims_datad u:object_r:vendor_ims_socket:s0
+/dev/socket/ipacm_log_file u:object_r:vendor_ipacm_socket:s0
+/dev/socket/cnd u:object_r:vendor_cnd_socket:s0
+/dev/socket/thermal-send-client u:object_r:vendor_thermal_socket:s0
+/dev/socket/thermal-recv-client u:object_r:vendor_thermal_socket:s0
+/dev/socket/thermal-recv-passive-client u:object_r:vendor_thermal_socket:s0
+/dev/socket/thermal-send-rule u:object_r:vendor_thermal_socket:s0
+/dev/socket/netmgr(/.*)? u:object_r:vendor_netmgrd_socket:s0
+/dev/socket/port-bridge(/.*)? u:object_r:vendor_port-bridge_socket:s0
+/dev/socket/qti_dpm_uds_file u:object_r:vendor_dataqti_socket:s0
+/dev/socket/location(/.*)? u:object_r:vendor_location_socket:s0
+/dev/socket/wifihal(/.*)? u:object_r:vendor_wifihal_socket:s0
+/dev/socket/pps u:object_r:vendor_pps_socket:s0
/dev/nq-nci u:object_r:nfc_device:s0
/dev/ttyHS0 u:object_r:hci_attach_dev:s0
-/dev/wlan u:object_r:wlan_device:s0
-/dev/socket/qmux_radio(/.*)? u:object_r:qmuxd_socket:s0
+/dev/wlan u:object_r:vendor_wlan_device:s0
+/dev/socket/qmux_radio(/.*)? u:object_r:vendor_qmuxd_socket:s0
/data/vendor/modem_config(/.*)? u:object_r:vendor_mbn_data_file:s0
-/dev/socket/qdcmsocket u:object_r:qdcmsocket_socket:s0
-/dev/qce u:object_r:qce_device:s0
+/dev/socket/qdcmsocket u:object_r:vendor_qdcmsocket_socket:s0
+/dev/qce u:object_r:vendor_qce_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/sda u:object_r:gpt_block_device:s0
+/dev/block/sda u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/sd[bc]1? u:object_r:xbl_block_device:s0
+/dev/block/sd[bc]1? u:object_r:vendor_xbl_block_device:s0
# Block device for hal_bootctl
/dev/block/sde u:object_r:boot_block_device:s0
@@ -113,79 +113,79 @@
/vendor/firmware(/.*)? u:object_r:vendor_firmware_file:s0
/vendor/bt_firmware(/.*)? u:object_r:vendor_firmware_file:s0
-/vendor/bin/ATFWD-daemon u:object_r:atfwd_exec:s0
+/vendor/bin/ATFWD-daemon u:object_r:vendor_atfwd_exec:s0
/vendor/bin/hw/android\.hardware\.vr@1\.0-service.crosshatch u:object_r:hal_vr_default_exec:s0
/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.fpc u:object_r:hal_fingerprint_default_exec:s0
-/vendor/bin/thermal-engine u:object_r:thermal-engine_exec:s0
-/vendor/bin/sensors.qcom u:object_r:sensors_exec:s0
-/vendor/bin/sensors.qti u:object_r:sensors_exec:s0
+/vendor/bin/thermal-engine u:object_r:vendor_thermal-engine_exec:s0
+/vendor/bin/sensors.qcom u:object_r:vendor_sensors_exec:s0
+/vendor/bin/sensors.qti u:object_r:vendor_sensors_exec:s0
/vendor/bin/ssr_setup u:object_r:vendor_ssr_setup_exec:s0
/vendor/bin/ssr_diag u:object_r:vendor_ssr_diag_exec:s0
/vendor/bin/pm-service u:object_r:vendor_per_mgr_exec:s0
/vendor/bin/pm-proxy u:object_r:vendor_per_proxy_exec:s0
/vendor/bin/qseecomd u:object_r:tee_exec:s0
/vendor/bin/subsystem_ramdump u:object_r:vendor_subsystem_ramdump_exec:s0
-/vendor/bin/adsprpcd u:object_r:adsprpcd_exec:s0
-/vendor/bin/cdsprpcd u:object_r:cdsprpcd_exec:s0
-/vendor/bin/irsc_util u:object_r:irsc_util_exec:s0
-/vendor/bin/rmt_storage u:object_r:rmt_storage_exec:s0
-/vendor/bin/tftp_server u:object_r:rfs_access_exec:s0
-/vendor/bin/cnss-daemon u:object_r:wcnss_service_exec:s0
-/vendor/bin/cnss_diag u:object_r:wcnss_service_exec:s0
-/vendor/bin/diag_mdlog u:object_r:qlogd_exec:s0
-/vendor/bin/netmgrd u:object_r:netmgrd_exec:s0
-/vendor/bin/port-bridge u:object_r:port-bridge_exec:s0
-/vendor/bin/qti u:object_r:qti_exec:s0
-/vendor/bin/loc_launcher u:object_r:location_exec:s0
-/vendor/bin/lowi-server u:object_r:location_exec:s0
-/vendor/bin/xtra-daemon u:object_r:location_exec:s0
+/vendor/bin/adsprpcd u:object_r:vendor_adsprpcd_exec:s0
+/vendor/bin/cdsprpcd u:object_r:vendor_cdsprpcd_exec:s0
+/vendor/bin/irsc_util u:object_r:vendor_irsc_util_exec:s0
+/vendor/bin/rmt_storage u:object_r:vendor_rmt_storage_exec:s0
+/vendor/bin/tftp_server u:object_r:vendor_rfs_access_exec:s0
+/vendor/bin/cnss-daemon u:object_r:vendor_wcnss_service_exec:s0
+/vendor/bin/cnss_diag u:object_r:vendor_wcnss_service_exec:s0
+/vendor/bin/diag_mdlog u:object_r:vendor_qlogd_exec:s0
+/vendor/bin/netmgrd u:object_r:vendor_netmgrd_exec:s0
+/vendor/bin/port-bridge u:object_r:vendor_port-bridge_exec:s0
+/vendor/bin/qti u:object_r:vendor_qti_exec:s0
+/vendor/bin/loc_launcher u:object_r:vendor_location_exec:s0
+/vendor/bin/lowi-server u:object_r:vendor_location_exec:s0
+/vendor/bin/xtra-daemon u:object_r:vendor_location_exec:s0
/vendor/bin/pd-mapper u:object_r:vendor_pd_mapper_exec:s0
-/vendor/bin/imsqmidaemon u:object_r:ims_exec:s0
-/vendor/bin/imsdatadaemon u:object_r:ims_exec:s0
-/vendor/bin/ims_rtp_daemon u:object_r:hal_imsrtp_exec:s0
+/vendor/bin/imsqmidaemon u:object_r:vendor_ims_exec:s0
+/vendor/bin/imsdatadaemon u:object_r:vendor_ims_exec:s0
+/vendor/bin/ims_rtp_daemon u:object_r:vendor_hal_imsrtp_exec:s0
/vendor/bin/ipacm u:object_r:hal_tetheroffload_default_exec:s0
/vendor/bin/ipacm-diag u:object_r:hal_tetheroffload_default_exec:s0
-/vendor/bin/cnd u:object_r:cnd_exec:s0
+/vendor/bin/cnd u:object_r:vendor_cnd_exec:s0
/vendor/bin/oemlock_provision u:object_r:hal_bootctl_default_exec:s0
/vendor/bin/oemlock-bridge u:object_r:hal_bootctl_default_exec:s0
-/(vendor|system/vendor)/bin/msm_irqbalance u:object_r:msm_irqbalanced_exec:s0
+/(vendor|system/vendor)/bin/msm_irqbalance u:object_r:vendor_msm_irqbalanced_exec:s0
/vendor/bin/hw/android\.hardware\.usb@1\.1-service.crosshatch u:object_r:hal_usb_default_exec:s0
-/vendor/bin/chre u:object_r:chre_exec:s0
-/vendor/bin/time_daemon u:object_r:time_daemon_exec:s0
-/vendor/bin/imsrcsd u:object_r:hal_rcsservice_exec:s0
-/vendor/bin/tloc_daemon u:object_r:tlocd_exec:s0
+/vendor/bin/chre u:object_r:vendor_chre_exec:s0
+/vendor/bin/time_daemon u:object_r:vendor_time_daemon_exec:s0
+/vendor/bin/imsrcsd u:object_r:vendor_hal_rcsservice_exec:s0
+/vendor/bin/tloc_daemon u:object_r:vendor_tlocd_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.power@1\.2-service u:object_r:hal_power_default_exec:s0
/vendor/bin/hw/qcrild u:object_r:rild_exec:s0
/vendor/bin/hw/qcrilNrd u:object_r:rild_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.0-service.widevine u:object_r:hal_drm_widevine_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@1\.0-service.widevine u:object_r:vendor_hal_drm_widevine_exec:s0
/vendor/bin/hw/android\.hardware\.vibrator@1\.1-service.crosshatch u:object_r:hal_vibrator_default_exec:s0
-/vendor/bin/hw/android\.hardware\.keymaster@3\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0
-/vendor/bin/hw/android\.hardware\.keymaster@4\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0
-/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service-qti u:object_r:hal_gatekeeper_qti_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.gnss@.*-service-qti u:object_r:hal_gnss_qti_exec:s0
+/vendor/bin/hw/android\.hardware\.keymaster@3\.0-service-qti u:object_r:vendor_hal_keymaster_qti_exec:s0
+/vendor/bin/hw/android\.hardware\.keymaster@4\.0-service-qti u:object_r:vendor_hal_keymaster_qti_exec:s0
+/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service-qti u:object_r:vendor_hal_gatekeeper_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.gnss@.*-service-qti u:object_r:vendor_hal_gnss_qti_exec:s0
/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service-qti u:object_r:hal_bluetooth_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.1-service.widevine u:object_r:hal_drm_widevine_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.2-service.widevine u:object_r:hal_drm_widevine_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.2-service-lazy.widevine u:object_r:hal_drm_widevine_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.1-service.widevine u:object_r:vendor_hal_drm_widevine_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.2-service.widevine u:object_r:vendor_hal_drm_widevine_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.2-service-lazy.widevine u:object_r:vendor_hal_drm_widevine_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.display\.allocator@1\.0-service u:object_r:hal_graphics_allocator_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.display\.allocator-service u:object_r:hal_graphics_allocator_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.display\.composer@1\.0-service u:object_r:hal_graphics_composer_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.display\.composer-service u:object_r:hal_graphics_composer_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.tui_comm@1\.0-service-qti u:object_r:hal_tui_comm_qti_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.qdutils_disp@1\.0-service-qti u:object_r:hal_qdutils_disp_qti_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.trustedui@1\.0-service-qti u:object_r:hal_trustedui_qti_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.capabilityconfigstore@1\.0-service u:object_r:hal_capabilityconfigstore_qti_default_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.tui_comm@1\.0-service-qti u:object_r:vendor_hal_tui_comm_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.qdutils_disp@1\.0-service-qti u:object_r:vendor_hal_qdutils_disp_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.trustedui@1\.0-service-qti u:object_r:vendor_hal_trustedui_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.capabilityconfigstore@1\.0-service u:object_r:vendor_hal_capabilityconfigstore_qti_default_exec:s0
-/(vendor|system/vendor)/bin/power_off_alarm u:object_r:power_off_alarm_exec:s0
+/(vendor|system/vendor)/bin/power_off_alarm u:object_r:vendor_power_off_alarm_exec:s0
/(vendor|system/vendor)/bin/grep u:object_r:vendor_toolbox_exec:s0
-/vendor/bin/hw/vendor\.display\.color@1\.0-service u:object_r:hal_display_color_default_exec:s0
+/vendor/bin/hw/vendor\.display\.color@1\.0-service u:object_r:vendor_hal_display_color_default_exec:s0
/vendor/bin/hw/vendor\.qti\.media\.c2@1\.0-service u:object_r:mediacodec_exec:s0
/vendor/bin/hw/hardware\.google\.media\.c2@1\.0-service-software u:object_r:mediacodec_exec:s0
-/vendor/bin/feature_enabler_client u:object_r:feature_enabler_client_exec:s0
-/(vendor|system/vendor)/bin/qdcmss u:object_r:qdcm-ss_exec:s0
+/vendor/bin/feature_enabler_client u:object_r:vendor_feature_enabler_client_exec:s0
+/(vendor|system/vendor)/bin/qdcmss u:object_r:vendor_qdcm-ss_exec:s0
###############################################
# same-process HAL files and their dependencies
@@ -271,25 +271,25 @@
/vendor/lib(64)?/libfastcvopt\.so u:object_r:same_process_hal_file:s0
# data files
-/data/vendor/netmgr(/.*)? u:object_r:netmgr_data_file:s0
-/data/vendor/netmgr/recovery(/.*)? u:object_r:netmgr_recovery_data_file:s0
-/data/vendor/location(/.*)? u:object_r:location_data_file:s0
+/data/vendor/netmgr(/.*)? u:object_r:vendor_netmgr_data_file:s0
+/data/vendor/netmgr/recovery(/.*)? u:object_r:vendor_netmgr_recovery_data_file:s0
+/data/vendor/location(/.*)? u:object_r:vendor_location_data_file:s0
/data/vendor/camera(/.*)? u:object_r:vendor_camera_data_file:s0
-/data/vendor/display(/.*)? u:object_r:display_vendor_data_file:s0
-/data/vendor/nfc(/.*)? u:object_r:nfc_vendor_data_file:s0
-/data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0
-/data/vendor/wifi/wlan_logs(/.*)? u:object_r:wifi_vendor_log_data_file:s0
-/data/vendor/ramdump(/.*)? u:object_r:ramdump_vendor_data_file:s0
-/data/vendor/ssrdump(/.*)? u:object_r:ramdump_vendor_data_file:s0
-/data/vendor/modem_dump(/.*)? u:object_r:modem_dump_file:s0
-/data/vendor/ipa(/.*)? u:object_r:ipa_vendor_data_file:s0
-/data/vendor/sensors(/.*)? u:object_r:sensors_vendor_data_file:s0
-/data/vendor/port_bridge(/.*)? u:object_r:port_bridge_data_file:s0
-/data/vendor/tloc(/.*)? u:object_r:tlocd_data_file:s0
-/data/vendor/connectivity(/.*)? u:object_r:cnd_data_file:s0
-/data/vendor/misc/qsee(/.*)? u:object_r:data_qsee_file:s0
+/data/vendor/display(/.*)? u:object_r:vendor_display_vendor_data_file:s0
+/data/vendor/nfc(/.*)? u:object_r:vendor_nfc_vendor_data_file:s0
+/data/vendor/radio(/.*)? u:object_r:vendor_radio_vendor_data_file:s0
+/data/vendor/wifi/wlan_logs(/.*)? u:object_r:vendor_wifi_vendor_log_data_file:s0
+/data/vendor/ramdump(/.*)? u:object_r:vendor_ramdump_vendor_data_file:s0
+/data/vendor/ssrdump(/.*)? u:object_r:vendor_ramdump_vendor_data_file:s0
+/data/vendor/modem_dump(/.*)? u:object_r:vendor_modem_dump_file:s0
+/data/vendor/ipa(/.*)? u:object_r:vendor_ipa_vendor_data_file:s0
+/data/vendor/sensors(/.*)? u:object_r:vendor_sensors_vendor_data_file:s0
+/data/vendor/port_bridge(/.*)? u:object_r:vendor_port_bridge_data_file:s0
+/data/vendor/tloc(/.*)? u:object_r:vendor_tlocd_data_file:s0
+/data/vendor/connectivity(/.*)? u:object_r:vendor_cnd_data_file:s0
+/data/vendor/misc/qsee(/.*)? u:object_r:vendor_data_qsee_file:s0
/data/vendor/tui(/.*)? u:object_r:vendor_tui_data_file:s0
-/data/vendor/tzstorage(/.*)? u:object_r:data_tzstorage_file:s0
+/data/vendor/tzstorage(/.*)? u:object_r:vendor_data_tzstorage_file:s0
/data/vendor/tombstones(/.*)? u:object_r:vendor_tombstone_data_file:s0
/data/vendor/time(/.*)? u:object_r:vendor_time_data_file:s0
@@ -303,17 +303,17 @@
/vendor/dsp(/.*)? u:object_r:adsprpcd_file:s0
# /persist
-/mnt/vendor/persist/data(/.*)? u:object_r:persist_data_file:s0
-/mnt/vendor/persist/display(/.*)? u:object_r:persist_display_file:s0
-/mnt/vendor/persist/drm(/.*)? u:object_r:persist_drm_file:s0
-/mnt/vendor/persist/elabel(/.*)? u:object_r:persist_elabel_file:s0
-/mnt/vendor/persist/haptics(/.*)? u:object_r:persist_haptics_file:s0
-/mnt/vendor/persist/hlos_rfs(/.*)? u:object_r:persist_rfs_shared_hlos_file:s0
-/mnt/vendor/persist/rfs(/.*)? u:object_r:persist_rfs_file:s0
-/mnt/vendor/persist/sensors(/.*)? u:object_r:persist_sensors_file:s0
-/mnt/vendor/persist/time(/.*)? u:object_r:persist_time_file:s0
-/mnt/vendor/persist/audio(/.*)? u:object_r:persist_audio_file:s0
-/mnt/vendor/persist/feature_enabler_client(/.*)? u:object_r:persist_feature_enabler_file:s0
+/mnt/vendor/persist/data(/.*)? u:object_r:vendor_persist_data_file:s0
+/mnt/vendor/persist/display(/.*)? u:object_r:vendor_persist_display_file:s0
+/mnt/vendor/persist/drm(/.*)? u:object_r:vendor_persist_drm_file:s0
+/mnt/vendor/persist/elabel(/.*)? u:object_r:vendor_persist_elabel_file:s0
+/mnt/vendor/persist/haptics(/.*)? u:object_r:vendor_persist_haptics_file:s0
+/mnt/vendor/persist/hlos_rfs(/.*)? u:object_r:vendor_persist_rfs_shared_hlos_file:s0
+/mnt/vendor/persist/rfs(/.*)? u:object_r:vendor_persist_rfs_file:s0
+/mnt/vendor/persist/sensors(/.*)? u:object_r:vendor_persist_sensors_file:s0
+/mnt/vendor/persist/time(/.*)? u:object_r:vendor_persist_time_file:s0
+/mnt/vendor/persist/audio(/.*)? u:object_r:vendor_persist_audio_file:s0
+/mnt/vendor/persist/feature_enabler_client(/.*)? u:object_r:vendor_persist_feature_enabler_file:s0
# graphics device
/dev/mdss_rotator u:object_r:graphics_device:s0
@@ -325,155 +325,155 @@
# sysfs_leds
/sys/devices/platform/soc/[a-f0-9]+.qcom,spmi/spmi-0/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,haptics@c000/leds/vibrator(/.*)? u:object_r:sysfs_leds:s0
-# sysfs_devfreq
-/sys/devices(/platform)?/soc/soc:qcom,l3-cpu[0-9]/devfreq/soc:qcom,l3-cpu[0-9](/.*)? u:object_r:sysfs_devfreq:s0
+# vendor_sysfs_devfreq
+/sys/devices(/platform)?/soc/soc:qcom,l3-cpu[0-9]/devfreq/soc:qcom,l3-cpu[0-9](/.*)? u:object_r:vendor_sysfs_devfreq:s0
-#sysfs_data
-/sys/devices/virtual/xt_hardidletimer/timers(/.*)? u:object_r:sysfs_data:s0
-/sys/devices/virtual/xt_idletimer/timers(/.*)? u:object_r:sysfs_data:s0
+#vendor_sysfs_data
+/sys/devices/virtual/xt_hardidletimer/timers(/.*)? u:object_r:vendor_sysfs_data:s0
+/sys/devices/virtual/xt_idletimer/timers(/.*)? u:object_r:vendor_sysfs_data:s0
#persist_bluetooth_file
-/mnt/vendor/persist/bluetooth(/.*)? u:object_r:persist_bluetooth_file:s0
+/mnt/vendor/persist/bluetooth(/.*)? u:object_r:vendor_persist_bluetooth_file:s0
#power off alarm file
-/mnt/vendor/persist/alarm(/.*)? u:object_r:persist_alarm_file:s0
+/mnt/vendor/persist/alarm(/.*)? u:object_r:vendor_persist_alarm_file:s0
-/(vendor|system/vendor)/bin/hbtp_daemon u:object_r:hbtp_exec:s0
-/(vendor|system/vendor)/bin/sscrpcd u:object_r:sensors_exec:s0
+/(vendor|system/vendor)/bin/hbtp_daemon u:object_r:vendor_hbtp_exec:s0
+/(vendor|system/vendor)/bin/sscrpcd u:object_r:vendor_sensors_exec:s0
-# sysfs_graphics
-/sys/class/graphics/fb0/mdp/caps u:object_r:sysfs_graphics:s0
+# vendor_sysfs_graphics
+/sys/class/graphics/fb0/mdp/caps u:object_r:vendor_sysfs_graphics:s0
/sys/class/thermal(/.*)? u:object_r:sysfs_thermal:s0
-/sys/devices/virtual/graphics/fb([0-3])+/idle_time u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/dynamic_fps u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/product_description u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/vendor_name u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/hdcp/tp u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_panel_status u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/hpd u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/res_info u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/s3d_mode u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_panel_info u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_type u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_split u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/show_blank_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/bl_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/ad_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/ad_bl_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/hist_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/vsync_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/lineptr_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/idle_notify u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_thermal_level u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/idle_power_collapse u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/mode u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/name u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/connected u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_cmd_autorefresh_en u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/mdp/bw_mode_bitmap u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/edid_modes u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/hdcp2p2(/.*) u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/scan_info u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/edid_3d_modes u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_dfps_mode u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_src_split_info u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/hdr_stream u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/cec(/.*) u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/msmfb_b10(/.*) u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/modes u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/edid_raw_data u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/packpattern u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/dyn_pu u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/ad u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/graphics/fb([0-3])+/pp_bl_event u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/rotator/mdss_rotator/caps u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/hdcp/msm_hdcp/min_level_change u:object_r:sysfs_graphics:s0
-/sys/class/lcd_bias/secure_mode u:object_r:sysfs_graphics:s0
-/sys/class/leds/wled/secure_mode u:object_r:sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/idle_time u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/dynamic_fps u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/product_description u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/vendor_name u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/hdcp/tp u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_panel_status u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/hpd u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/res_info u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/s3d_mode u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_panel_info u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_type u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_split u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/show_blank_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/bl_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/ad_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/ad_bl_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/hist_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/vsync_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/lineptr_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/idle_notify u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_thermal_level u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/idle_power_collapse u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/mode u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/name u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/connected u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_cmd_autorefresh_en u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/mdp/bw_mode_bitmap u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/edid_modes u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/hdcp2p2(/.*) u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/scan_info u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/edid_3d_modes u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_dfps_mode u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msm_fb_src_split_info u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/hdr_stream u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/cec(/.*) u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/msmfb_b10(/.*) u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/modes u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/edid_raw_data u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/packpattern u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/dyn_pu u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/ad u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/graphics/fb([0-3])+/pp_bl_event u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/rotator/mdss_rotator/caps u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/hdcp/msm_hdcp/min_level_change u:object_r:vendor_sysfs_graphics:s0
+/sys/class/lcd_bias/secure_mode u:object_r:vendor_sysfs_graphics:s0
+/sys/class/leds/wled/secure_mode u:object_r:vendor_sysfs_graphics:s0
-/sys/devices/platform/vfb.([0-3])+/graphics/fb([0-3])+/modes u:object_r:sysfs_graphics:s0
-/sys/devices/platform/vfb.([0-3])+/graphics/fb([0-3])+/mode u:object_r:sysfs_graphics:s0
-/sys/module/drm/parameters/vblankoffdelay u:object_r:sysfs_graphics:s0
-/sys/devices/platform/soc/[a-f0-9]+.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/modes u:object_r:sysfs_graphics:s0
-/sys/devices/platform/soc/[a-f0-9]+.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/status u:object_r:sysfs_graphics:s0
-/sys/class/graphics/fb([0-3])+/mdp/caps u:object_r:sysfs_graphics:s0
-/sys/class/graphics/fb([0-3])+/ad u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[0-9a-f]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-f]+.qcom,spmi:qcom,pmi[0-9]+@[0-9]+:qcom,leds@[a-f0-9]+(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices/platform/soc/ae00000.qcom,mdss_mdp/backlight(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices/virtual/switch/hdmi(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_mdp/[a-f0-9]+.qcom,mdss_mdp:qcom,mdss_fb_primary/leds/lcd-backlight(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices/soc.0/[a-f0-9]+.qcom,mdss_mdp/qcom,mdss_fb_primary.+[a-f0-9]/leds/lcd-backlight(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_mdp/caps u:object_r:sysfs_graphics:s0
-/sys/devices/soc/[a-f0-9]+.qcom,mdss_mdp/bw_mode_bitmap u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_mdp/bw_mode_bitmap u:object_r:sysfs_graphics:s0
-/sys/devices/soc.0/[a-f0-9]+.qcom,mdss_mdp/bw_mode_bitmap u:object_r:sysfs_graphics:s0
-/sys/devices/soc.0/[a-f0-9]+.qcom,mdss_mdp/caps u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_cam/video4linux/video[0-33]/name(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_rotator/video4linux/video[0-33]/name(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_rotator/caps u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,vidc/video4linux/video[0-33]/name(/.*)? u:object_r:sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,cci/[a-f0-9]+.qcom,cci:qcom,camera@[0-2]/video4linux/video[0-33]/name(/.*)? u:object_r:sysfs_graphics:s0
+/sys/devices/platform/vfb.([0-3])+/graphics/fb([0-3])+/modes u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/platform/vfb.([0-3])+/graphics/fb([0-3])+/mode u:object_r:vendor_sysfs_graphics:s0
+/sys/module/drm/parameters/vblankoffdelay u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/platform/soc/[a-f0-9]+.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/modes u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/platform/soc/[a-f0-9]+.qcom,mdss_mdp/drm/card([0-3])+/card([0-3])+-DSI-1/status u:object_r:vendor_sysfs_graphics:s0
+/sys/class/graphics/fb([0-3])+/mdp/caps u:object_r:vendor_sysfs_graphics:s0
+/sys/class/graphics/fb([0-3])+/ad u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[0-9a-f]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-f]+.qcom,spmi:qcom,pmi[0-9]+@[0-9]+:qcom,leds@[a-f0-9]+(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/platform/soc/ae00000.qcom,mdss_mdp/backlight(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/virtual/switch/hdmi(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_mdp/[a-f0-9]+.qcom,mdss_mdp:qcom,mdss_fb_primary/leds/lcd-backlight(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/soc.0/[a-f0-9]+.qcom,mdss_mdp/qcom,mdss_fb_primary.+[a-f0-9]/leds/lcd-backlight(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_mdp/caps u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/soc/[a-f0-9]+.qcom,mdss_mdp/bw_mode_bitmap u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_mdp/bw_mode_bitmap u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/soc.0/[a-f0-9]+.qcom,mdss_mdp/bw_mode_bitmap u:object_r:vendor_sysfs_graphics:s0
+/sys/devices/soc.0/[a-f0-9]+.qcom,mdss_mdp/caps u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_cam/video4linux/video[0-33]/name(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_rotator/video4linux/video[0-33]/name(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,mdss_rotator/caps u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,vidc/video4linux/video[0-33]/name(/.*)? u:object_r:vendor_sysfs_graphics:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,cci/[a-f0-9]+.qcom,cci:qcom,camera@[0-2]/video4linux/video[0-33]/name(/.*)? u:object_r:vendor_sysfs_graphics:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.sdhci/mmc_host/mmc0/clk_scaling(/.*)? u:object_r:sysfs_mmc_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/clkscale_enable u:object_r:sysfs_scsi_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+/host0/scsi_host/host0(/.*)? u:object_r:sysfs_scsi_host:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/host0/target0:0:0/0:0:0:[0-9]+/scsi_generic(/.*)? u:object_r:sysfs_scsi_target:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.sdhci/mmc_host/mmc0/clk_scaling(/.*)? u:object_r:vendor_sysfs_mmc_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/clkscale_enable u:object_r:vendor_sysfs_scsi_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+/host0/scsi_host/host0(/.*)? u:object_r:vendor_sysfs_scsi_host:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/host0/target0:0:0/0:0:0:[0-9]+/scsi_generic(/.*)? u:object_r:vendor_sysfs_scsi_target:s0
/data/vendor/media(/.*)? u:object_r:vendor_media_data_file:s0
-/data/vendor/mediadrm(/.*)? u:object_r:mediadrm_vendor_data_file:s0
-/data/vendor/nnhal(/.*)? u:object_r:hal_neuralnetworks_data_file:s0
+/data/vendor/mediadrm(/.*)? u:object_r:vendor_mediadrm_vendor_data_file:s0
+/data/vendor/nnhal(/.*)? u:object_r:vendor_hal_neuralnetworks_data_file:s0
-/sys/devices(/platform)?/soc/[a-f0-9\.:]+,[a-f0-9\-\_]+/subsys[0-9]+/name u:object_r:sysfs_ssr:s0
+/sys/devices(/platform)?/soc/[a-f0-9\.:]+,[a-f0-9\-\_]+/subsys[0-9]+/name u:object_r:vendor_sysfs_ssr:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/devfreq/[a-f0-9]+.qcom,kgsl-3d0(/.*)? u:object_r:sysfs_kgsl:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0(/.*)? u:object_r:vendor_sysfs_kgsl:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/devfreq/[a-f0-9]+.qcom,kgsl-3d0(/.*)? u:object_r:vendor_sysfs_kgsl:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,usb-pdphy@[0-9]+/usbpd/usbpd[0-9](/.*)? u:object_r:sysfs_usbpd_device:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/usb(/.*)? u:object_r:sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/pc_port(/.*)? u:object_r:sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.i2c/i2c-[0-9]+/[0-9]+-[0-9]+/[a-f0-9]+.i2c:qcom,[a-z0-9]+@[0-9]:qcom,smb[0-9]+-charger@[0-9]+/power_supply/parallel(/.*)? u:object_r:sysfs_usb_supply:s0
-/sys/devices/soc/[a-f0-9]+.ssusb/power_supply/usb(/.*)? u:object_r:sysfs_usb_supply:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,usb-pdphy@[0-9]+/usbpd/usbpd[0-9](/.*)? u:object_r:vendor_sysfs_usbpd_device:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/usb(/.*)? u:object_r:vendor_sysfs_usb_supply:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/pc_port(/.*)? u:object_r:vendor_sysfs_usb_supply:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.i2c/i2c-[0-9]+/[0-9]+-[0-9]+/[a-f0-9]+.i2c:qcom,[a-z0-9]+@[0-9]:qcom,smb[0-9]+-charger@[0-9]+/power_supply/parallel(/.*)? u:object_r:vendor_sysfs_usb_supply:s0
+/sys/devices/soc/[a-f0-9]+.ssusb/power_supply/usb(/.*)? u:object_r:vendor_sysfs_usb_supply:s0
-/data/(misc|vendor)/hbtp(/.*)? u:object_r:hbtp_log_file:s0
-/vendor/etc/hbtp/* u:object_r:hbtp_cfg_file:s0
+/data/(misc|vendor)/hbtp(/.*)? u:object_r:vendor_hbtp_log_file:s0
+/vendor/etc/hbtp/* u:object_r:vendor_hbtp_cfg_file:s0
-/sys/devices/qpnp-charger.*/power_supply/battery(/.*)? u:object_r:sysfs_battery_supply:s0
+/sys/devices/qpnp-charger.*/power_supply/battery(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
# TODO: move this 2 line to target specfic file_contexts/genfs_context
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/battery(/.*)? u:object_r:sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qpnp,fg/power_supply/bms(/.*)? u:object_r:sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/battery(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qpnp,fg/power_supply/bms(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
-/sys/class/qcom-battery(/.*)? u:object_r:sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/qpnp-linear-charger-[a-f0-9]+/power_supply/battery(/.*)? u:object_r:sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/qpnp-vm-bms-[a-f0-9]+/power_supply/bms(/.*)? u:object_r:sysfs_battery_supply:s0
-/sys/devices/soc/qpnp-smbcharger-[a-f0-9]+/power_supply/battery(/.*)? u:object_r:sysfs_battery_supply:s0
-/sys/devices/soc/qpnp-fg-[a-f0-9]+/power_supply/bms(/.*)? u:object_r:sysfs_battery_supply:s0
-/sys/devices/soc/qpnp-smbcharger-[a-f0-9]+/power_supply/dc(/.*)? u:object_r:sysfs_battery_supply:s0
-/sys/devices/soc/[a-f0-9]+.i2c/i2c-[0-9]/[0-9]-[a-f0-9]+/power_supply/parallel(/.*)? u:object_r:sysfs_battery_supply:s0
+/sys/class/qcom-battery(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/qpnp-linear-charger-[a-f0-9]+/power_supply/battery(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices(/platform)?/soc/qpnp-vm-bms-[a-f0-9]+/power_supply/bms(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/soc/qpnp-smbcharger-[a-f0-9]+/power_supply/battery(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/soc/qpnp-fg-[a-f0-9]+/power_supply/bms(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/soc/qpnp-smbcharger-[a-f0-9]+/power_supply/dc(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/soc/[a-f0-9]+.i2c/i2c-[0-9]/[0-9]-[a-f0-9]+/power_supply/parallel(/.*)? u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices/soc/qpnp-vadc-[0-9]+(/.*)? u:object_r:sysfs_vadc_dev:s0
+/sys/devices/soc/qpnp-vadc-[0-9]+(/.*)? u:object_r:vendor_sysfs_vadc_dev:s0
#Android NN Driver
-/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-qti u:object_r:hal_neuralnetworks_default_exec:s0
+/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-qti u:object_r:vendor_hal_neuralnetworks_default_exec:s0
-/(vendor|system/vendor)/bin/init\.class_main\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.crda\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.mdm\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.class_core\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.coex\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.crashdata\.sh u:object_r:init-qcom-crashdata-sh_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.debug\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.debug-sdm660\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.debug-sdm670\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.early_boot\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.efs\.sync\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.post_boot\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.sdio\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.sensors\.sh u:object_r:init-qcom-sensors-sh_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.syspart_fixup\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.usb\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qcom\.wifi\.sh u:object_r:qti_init_shell_exec:s0
-/(vendor|system/vendor)/bin/init\.qti\.ims\.sh u:object_r:init-qti-ims-sh_exec:s0
-/(vendor|system/vendor)/bin/qca6234-service.sh u:object_r:qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.class_main\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.crda\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.mdm\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.class_core\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.coex\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.crashdata\.sh u:object_r:vendor_init-qcom-crashdata-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.debug\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.debug-sdm660\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.debug-sdm670\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.early_boot\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.efs\.sync\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.post_boot\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.sdio\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.sensors\.sh u:object_r:vendor_init-qcom-sensors-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.syspart_fixup\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.usb\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.wifi\.sh u:object_r:vendor_qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.ims\.sh u:object_r:vendor_init-qti-ims-sh_exec:s0
+/(vendor|system/vendor)/bin/qca6234-service.sh u:object_r:vendor_qti_init_shell_exec:s0
#Limits sysfs node
/sys/module/msm_isense_cdsp/data u:object_r:sysfs_thermal:s0
diff --git a/generic/vendor/common/fsck.te b/generic/vendor/common/fsck.te
index 9db590f..338cb65 100644
--- a/generic/vendor/common/fsck.te
+++ b/generic/vendor/common/fsck.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow fsck persist_block_device:blk_file rw_file_perms;
+allow fsck vendor_persist_block_device:blk_file rw_file_perms;
diff --git a/generic/vendor/common/genfs_contexts b/generic/vendor/common/genfs_contexts
index cb5671a..e8ba86e 100644
--- a/generic/vendor/common/genfs_contexts
+++ b/generic/vendor/common/genfs_contexts
@@ -24,118 +24,118 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-genfscon proc /debug/fwdump u:object_r:proc_wifi_dbg:s0
-genfscon proc /debugdriver/driverdump u:object_r:proc_wifi_dbg:s0
-genfscon proc /ath_pktlog/cld u:object_r:proc_wifi_dbg:s0
+genfscon proc /debug/fwdump u:object_r:vendor_proc_wifi_dbg:s0
+genfscon proc /debugdriver/driverdump u:object_r:vendor_proc_wifi_dbg:s0
+genfscon proc /ath_pktlog/cld u:object_r:vendor_proc_wifi_dbg:s0
-genfscon sysfs /android_touch u:object_r:sysfs_touch:s0
-genfscon sysfs /devices/virtual/input/ftm4_touch u:object_r:sysfs_touch:s0
+genfscon sysfs /android_touch u:object_r:vendor_sysfs_touch:s0
+genfscon sysfs /devices/virtual/input/ftm4_touch u:object_r:vendor_sysfs_touch:s0
#genfscon sysfs /class/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0
-genfscon sysfs /kernel/irq_helper/irq_blacklist_on u:object_r:sysfs_irqbalance:s0
+genfscon sysfs /kernel/irq_helper/irq_blacklist_on u:object_r:vendor_sysfs_irqbalance:s0
-genfscon sysfs /kernel/wcd_cpe0 u:object_r:sysfs_audio:s0
+genfscon sysfs /kernel/wcd_cpe0 u:object_r:vendor_sysfs_audio:s0
genfscon sysfs /class/uio u:object_r:sysfs_uio:s0
genfscon sysfs /devices/soc/soc:bt_wcn3990 u:object_r:sysfs_bluetooth_writable:s0
-genfscon sysfs /class/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpubw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu0/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu2/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu4/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu6/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu0/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu2/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu4/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu6/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mincpubw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,llccbw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/soc/soc:qcom,cpubw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/soc/soc:qcom,memlat-cpu0/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/soc/soc:qcom,memlat-cpu2/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/soc/soc:qcom,memlat-cpu4/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/soc/soc:qcom,memlat-cpu6/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/soc/soc:qcom,mincpubw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom.qcom,mdss_mdp/caps u:object_r:sysfs_mdss_mdp_caps:s0
+genfscon sysfs /class/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpubw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu0/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu2/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu4/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,memlat-cpu6/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu0/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu2/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu4/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,l3-cpu6/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mincpubw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,llccbw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/soc/soc:qcom,cpubw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/soc/soc:qcom,memlat-cpu0/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/soc/soc:qcom,memlat-cpu2/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/soc/soc:qcom,memlat-cpu4/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/soc/soc:qcom,memlat-cpu6/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/soc/soc:qcom,mincpubw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom.qcom,mdss_mdp/caps u:object_r:vendor_sysfs_mdss_mdp_caps:s0
genfscon sysfs /devices/platform/soc/c17a000.i2c/i2c-6/6-005a/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/c1b5000.i2c/i2c-7/7-0030/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/c900000.qcom,mdss_mdp:qcom,mdss_fb_primary/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-03/800f000.qcom,spmi:qcom,pmi8998@3:qcom,leds@d000/leds u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws@1e08000 u:object_r:sysfs_data:s0
-genfscon sysfs /devices/platform/soc/0.qcom,rmtfs_sharedmem/uio u:object_r:sysfs_uio_file:s0
-genfscon sysfs /devices/platform/soc/soc:fp_fpc1020 u:object_r:sysfs_fingerprint:s0
-genfscon sysfs /devices/virtual/wahoo_laser u:object_r:sysfs_laser:s0
-genfscon sysfs /module/cpu_boost u:object_r:sysfs_cpu_boost:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws@1e08000 u:object_r:vendor_sysfs_data:s0
+genfscon sysfs /devices/platform/soc/0.qcom,rmtfs_sharedmem/uio u:object_r:vendor_sysfs_uio_file:s0
+genfscon sysfs /devices/platform/soc/soc:fp_fpc1020 u:object_r:vendor_sysfs_fingerprint:s0
+genfscon sysfs /devices/virtual/wahoo_laser u:object_r:vendor_sysfs_laser:s0
+genfscon sysfs /module/cpu_boost u:object_r:vendor_sysfs_cpu_boost:s0
genfscon sysfs /devices/virtual/thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /class/thermal u:object_r:sysfs_thermal:s0
-genfscon sysfs /class/lcd_bias u:object_r:sysfs_lcd:s0
+genfscon sysfs /class/lcd_bias u:object_r:vendor_sysfs_lcd:s0
genfscon sysfs /module/msm_thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /devices/platform/battery_current_limit u:object_r:sysfs_thermal:s0
-genfscon sysfs /module/diagchar/parameters/timestamp_switch u:object_r:sysfs_timestamp_switch:s0
-genfscon sysfs /module/msm_performance u:object_r:sysfs_msm_perf:s0
-genfscon sysfs /module/lpm_levels u:object_r:sysfs_msm_power:s0
-genfscon sysfs /module/lpm_stats u:object_r:sysfs_msm_stats:s0
-genfscon sysfs /devices/virtual/graphics/fb0 u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/virtual/graphics/fb1 u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/soc/8c0000.qcom,msm-cam u:object_r:sysfs_camera:s0
-genfscon sysfs /devices/soc0 u:object_r:sysfs_soc:s0
-genfscon sysfs /devices/soc/caa0000.qcom,jpeg u:object_r:sysfs_camera:s0
-genfscon sysfs /devices/soc/caa4000.qcom,fd u:object_r:sysfs_camera:s0
+genfscon sysfs /module/diagchar/parameters/timestamp_switch u:object_r:vendor_sysfs_timestamp_switch:s0
+genfscon sysfs /module/msm_performance u:object_r:vendor_sysfs_msm_perf:s0
+genfscon sysfs /module/lpm_levels u:object_r:vendor_sysfs_msm_power:s0
+genfscon sysfs /module/lpm_stats u:object_r:vendor_sysfs_msm_stats:s0
+genfscon sysfs /devices/virtual/graphics/fb0 u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/virtual/graphics/fb1 u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/soc/8c0000.qcom,msm-cam u:object_r:vendor_sysfs_camera:s0
+genfscon sysfs /devices/soc0 u:object_r:vendor_sysfs_soc:s0
+genfscon sysfs /devices/soc/caa0000.qcom,jpeg u:object_r:vendor_sysfs_camera:s0
+genfscon sysfs /devices/soc/caa4000.qcom,fd u:object_r:vendor_sysfs_camera:s0
genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qpnp,fg/power_supply/bms/capacity u:object_r:sysfs_batteryinfo:s0
genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qcom,qpnp-smb2/power_supply/battery/capacity u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /bus/msm_subsys u:object_r:sysfs_ssr:s0
-genfscon sysfs /module/subsystem_restart u:object_r:sysfs_msm_subsys_restart:s0
-genfscon sysfs /kernel/boot_adsp/boot u:object_r:sysfs_boot_adsp:s0
-genfscon sysfs /kernel/boot_slpi u:object_r:sysfs_slpi:s0
-genfscon sysfs /devices/soc/c1b7000.i2c/i2c-9/9-0008 u:object_r:sysfs_easel:s0
-genfscon sysfs /class/typec u:object_r:sysfs_usb_c:s0
-genfscon sysfs /class/typec/usbc0 u:object_r:sysfs_usb_c:s0
-genfscon sysfs /devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto/usb1 u:object_r:sysfs_usb_device:s0
-genfscon sysfs /devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto/usb2 u:object_r:sysfs_usb_device:s0
+genfscon sysfs /bus/msm_subsys u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /module/subsystem_restart u:object_r:vendor_sysfs_msm_subsys_restart:s0
+genfscon sysfs /kernel/boot_adsp/boot u:object_r:vendor_sysfs_boot_adsp:s0
+genfscon sysfs /kernel/boot_slpi u:object_r:vendor_sysfs_slpi:s0
+genfscon sysfs /devices/soc/c1b7000.i2c/i2c-9/9-0008 u:object_r:vendor_sysfs_easel:s0
+genfscon sysfs /class/typec u:object_r:vendor_sysfs_usb_c:s0
+genfscon sysfs /class/typec/usbc0 u:object_r:vendor_sysfs_usb_c:s0
+genfscon sysfs /devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto/usb1 u:object_r:vendor_sysfs_usb_device:s0
+genfscon sysfs /devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto/usb2 u:object_r:vendor_sysfs_usb_device:s0
-genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qcom,usb-pdphy@1700/usbpd0/typec u:object_r:sysfs_usb_c:s0
-genfscon sysfs /module/diagchar u:object_r:sysfs_diag:s0
+genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qcom,usb-pdphy@1700/usbpd0/typec u:object_r:vendor_sysfs_usb_c:s0
+genfscon sysfs /module/diagchar u:object_r:vendor_sysfs_diag:s0
-genfscon sysfs /devices/virtual/kgsl u:object_r:sysfs_kgsl:s0
-genfscon sysfs /class/kgsl u:object_r:sysfs_kgsl:s0
-genfscon sysfs /devices/virtual/kgsl/kgsl/proc u:object_r:sysfs_kgsl_proc:s0
-genfscon sysfs /devices/virtual/workqueue/kgsl-events/cpumask u:object_r:sysfs_kgsl:s0
-genfscon sysfs /devices/virtual/workqueue/kgsl-events/nice u:object_r:sysfs_kgsl:s0
-genfscon sysfs /devices/virtual/workqueue/kgsl-workqueue/cpumask u:object_r:sysfs_kgsl:s0
-genfscon sysfs /devices/virtual/workqueue/kgsl-workqueue/nice u:object_r:sysfs_kgsl:s0
+genfscon sysfs /devices/virtual/kgsl u:object_r:vendor_sysfs_kgsl:s0
+genfscon sysfs /class/kgsl u:object_r:vendor_sysfs_kgsl:s0
+genfscon sysfs /devices/virtual/kgsl/kgsl/proc u:object_r:vendor_sysfs_kgsl_proc:s0
+genfscon sysfs /devices/virtual/workqueue/kgsl-events/cpumask u:object_r:vendor_sysfs_kgsl:s0
+genfscon sysfs /devices/virtual/workqueue/kgsl-events/nice u:object_r:vendor_sysfs_kgsl:s0
+genfscon sysfs /devices/virtual/workqueue/kgsl-workqueue/cpumask u:object_r:vendor_sysfs_kgsl:s0
+genfscon sysfs /devices/virtual/workqueue/kgsl-workqueue/nice u:object_r:vendor_sysfs_kgsl:s0
-genfscon sysfs /module/drm/parameters/vblankoffdelay u:object_r:sysfs_graphics:s0
+genfscon sysfs /module/drm/parameters/vblankoffdelay u:object_r:vendor_sysfs_graphics:s0
-genfscon sysfs /class/sensors u:object_r:sysfs_sensors:s0
-genfscon sysfs /bus/esoc u:object_r:sysfs_esoc:s0
+genfscon sysfs /class/sensors u:object_r:vendor_sysfs_sensors:s0
+genfscon sysfs /bus/esoc u:object_r:vendor_sysfs_esoc:s0
-genfscon sysfs /devices/soc/soc:hbtp/secure_touch u:object_r:hbtp_kernel_sysfs:s0
-genfscon sysfs /devices/soc/soc:hbtp/secure_touch_enable u:object_r:hbtp_kernel_sysfs:s0
-genfscon sysfs /devices/soc/soc:hbtp/secure_touch_userspace u:object_r:hbtp_kernel_sysfs:s0
-genfscon sysfs /kernel/hbtp/display_pwr u:object_r:hbtp_kernel_sysfs:s0
+genfscon sysfs /devices/soc/soc:hbtp/secure_touch u:object_r:vendor_hbtp_kernel_sysfs:s0
+genfscon sysfs /devices/soc/soc:hbtp/secure_touch_enable u:object_r:vendor_hbtp_kernel_sysfs:s0
+genfscon sysfs /devices/soc/soc:hbtp/secure_touch_userspace u:object_r:vendor_hbtp_kernel_sysfs:s0
+genfscon sysfs /kernel/hbtp/display_pwr u:object_r:vendor_hbtp_kernel_sysfs:s0
-genfscon sysfs /devices/virtual/net/bond0/bonding/queue_id u:object_r:sysfs_bond0:s0
-genfscon sysfs /devices/virtual/net/bond0/queues/rx-0/rps_cpus u:object_r:sysfs_bond0:s0
+genfscon sysfs /devices/virtual/net/bond0/bonding/queue_id u:object_r:vendor_sysfs_bond0:s0
+genfscon sysfs /devices/virtual/net/bond0/queues/rx-0/rps_cpus u:object_r:vendor_sysfs_bond0:s0
genfscon sysfs /firmware/devicetree/base/cpus u:object_r:sysfs_devices_system_cpu:s0
-genfscon sysfs /bus/spmi/devices u:object_r:sysfs_spmi_dev:s0
+genfscon sysfs /bus/spmi/devices u:object_r:vendor_sysfs_spmi_dev:s0
-genfscon sysfs /power/mem_sleep u:object_r:sysfs_suspend:s0
-genfscon sysfs /kernel/boot_adsp/ssr u:object_r:sysfs_adsp_ssr:s0
+genfscon sysfs /power/mem_sleep u:object_r:vendor_sysfs_suspend:s0
+genfscon sysfs /kernel/boot_adsp/ssr u:object_r:vendor_sysfs_adsp_ssr:s0
-genfscon debugfs /kgsl/proc u:object_r:debugfs_kgsl:s0
-genfscon debugfs /clk/debug_suspend u:object_r:debugfs_clk:s0
-genfscon debugfs /wlan0 u:object_r:debugfs_wlan:s0
+genfscon debugfs /kgsl/proc u:object_r:vendor_debugfs_kgsl:s0
+genfscon debugfs /clk/debug_suspend u:object_r:vendor_debugfs_clk:s0
+genfscon debugfs /wlan0 u:object_r:vendor_debugfs_wlan:s0
-genfscon debugfs /rpm_stats u:object_r:debugfs_rpm:s0
-genfscon debugfs /rpm_master_stats u:object_r:debugfs_rpm:s0
-genfscon debugfs /ion u:object_r:debugfs_ion:s0
-genfscon debugfs /ipc_logging u:object_r:debugfs_ipc:s0
-genfscon debugfs /system_stats u:object_r:debugfs_rpm:s0
-genfscon debugfs /tcpm/usbpd0 u:object_r:debugfs_usb:s0
-genfscon debugfs /pd_engine/usbpd0 u:object_r:debugfs_usb:s0
-genfscon debugfs /ipc_logging/smblib/log u:object_r:debugfs_usb:s0
-genfscon debugfs /msm_ipc_router u:object_r:debugfs_ipc:s0
-genfscon debugfs /mdp u:object_r:debugfs_mdp:s0
-genfscon debugfs /rmt_storage u:object_r:debugfs_rmt_storage:s0
-genfscon debugfs /icnss u:object_r:debugfs_icnss:s0
+genfscon debugfs /rpm_stats u:object_r:vendor_debugfs_rpm:s0
+genfscon debugfs /rpm_master_stats u:object_r:vendor_debugfs_rpm:s0
+genfscon debugfs /ion u:object_r:vendor_debugfs_ion:s0
+genfscon debugfs /ipc_logging u:object_r:vendor_debugfs_ipc:s0
+genfscon debugfs /system_stats u:object_r:vendor_debugfs_rpm:s0
+genfscon debugfs /tcpm/usbpd0 u:object_r:vendor_debugfs_usb:s0
+genfscon debugfs /pd_engine/usbpd0 u:object_r:vendor_debugfs_usb:s0
+genfscon debugfs /ipc_logging/smblib/log u:object_r:vendor_debugfs_usb:s0
+genfscon debugfs /msm_ipc_router u:object_r:vendor_debugfs_ipc:s0
+genfscon debugfs /mdp u:object_r:vendor_debugfs_mdp:s0
+genfscon debugfs /rmt_storage u:object_r:vendor_debugfs_rmt_storage:s0
+genfscon debugfs /icnss u:object_r:vendor_debugfs_icnss:s0
diff --git a/generic/vendor/common/hal_alarm_qti_default.te b/generic/vendor/common/hal_alarm_qti_default.te
index 810a647..c65d2e9 100755
--- a/generic/vendor/common/hal_alarm_qti_default.te
+++ b/generic/vendor/common/hal_alarm_qti_default.te
@@ -25,12 +25,12 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_alarm_qti_default, domain;
+type vendor_hal_alarm_qti_default, domain;
-hal_server_domain(hal_alarm_qti_default, hal_alarm_qti)
+hal_server_domain(vendor_hal_alarm_qti_default, vendor_hal_alarm_qti)
-type hal_alarm_qti_default_exec, exec_type, vendor_file_type, file_type;
+type vendor_hal_alarm_qti_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_alarm_qti_default)
+init_daemon_domain(vendor_hal_alarm_qti_default)
-allow hal_alarm_qti_default rtc_device:chr_file r_file_perms;
+allow vendor_hal_alarm_qti_default rtc_device:chr_file r_file_perms;
diff --git a/generic/vendor/common/hal_atfwd.te b/generic/vendor/common/hal_atfwd.te
index 584c62a..5670a34 100644
--- a/generic/vendor/common/hal_atfwd.te
+++ b/generic/vendor/common/hal_atfwd.te
@@ -26,5 +26,5 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(atfwd, qtelephony);
-allow atfwd hal_atfwd_hwservice:hwservice_manager find;
\ No newline at end of file
+binder_call(vendor_atfwd, qtelephony);
+allow vendor_atfwd hal_atfwd_hwservice:hwservice_manager find;
diff --git a/generic/vendor/common/hal_audio_default.te b/generic/vendor/common/hal_audio_default.te
index 704ac1f..e37005d 100644
--- a/generic/vendor/common/hal_audio_default.te
+++ b/generic/vendor/common/hal_audio_default.te
@@ -26,15 +26,15 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
userdebug_or_eng(`
- allow hal_audio diag_device:chr_file rw_file_perms;
+ allow hal_audio vendor_diag_device:chr_file rw_file_perms;
allow hal_audio_default debugfs:dir r_dir_perms;
')
-hal_client_domain(hal_audio_default, hal_perf)
+hal_client_domain(hal_audio_default, vendor_hal_perf)
hal_client_domain(hal_audio_default, hal_power)
# read-only permission to obtain the calibration data
-r_dir_file(hal_audio_default, persist_audio_file);
+r_dir_file(hal_audio_default, vendor_persist_audio_file);
allow hal_audio_default mnt_vendor_file:dir search;
#Allow access to firmware
@@ -42,7 +42,7 @@
allow hal_audio firmware_file:file r_file_perms;
# Allow hal_audio to read soundcard state under /proc/asound
-allow hal_audio proc_audiod:file r_file_perms;
+allow hal_audio vendor_proc_audiod:file r_file_perms;
allow hal_audio_default vendor_audio_data_file:dir rw_dir_perms;
allow hal_audio_default vendor_audio_data_file:file create_file_perms;
@@ -51,8 +51,8 @@
vndbinder_use(hal_audio)
#allow acess to wcd_cpe
-allow hal_audio sysfs_audio:file rw_file_perms;
-allow hal_audio sysfs_audio:dir r_dir_perms ;
+allow hal_audio vendor_sysfs_audio:file rw_file_perms;
+allow hal_audio vendor_sysfs_audio:dir r_dir_perms ;
# audio properties
get_prop(hal_audio, vendor_audio_prop)
diff --git a/generic/vendor/common/hal_bluetooth_default.te b/generic/vendor/common/hal_bluetooth_default.te
index f96e49b..7b6c1ad 100644
--- a/generic/vendor/common/hal_bluetooth_default.te
+++ b/generic/vendor/common/hal_bluetooth_default.te
@@ -24,7 +24,7 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_bluetooth_default bt_device:chr_file rw_file_perms;
+allow hal_bluetooth_default vendor_bt_device:chr_file rw_file_perms;
# talk to system_server to set priority
allow hal_bluetooth fwk_scheduler_hwservice:hwservice_manager find;
@@ -36,20 +36,20 @@
#For bluetooth firmware
r_dir_file(hal_bluetooth_default, bt_firmware_file)
-allow hal_bluetooth_default persist_bluetooth_file:dir rw_dir_perms;
-allow hal_bluetooth_default persist_bluetooth_file:file create_file_perms;
+allow hal_bluetooth_default vendor_persist_bluetooth_file:dir rw_dir_perms;
+allow hal_bluetooth_default vendor_persist_bluetooth_file:file create_file_perms;
#For QMI socket
allow hal_bluetooth_default self:{ qipcrtr_socket } create_socket_perms_no_ioctl;
userdebug_or_eng(`
diag_use(hal_bluetooth)
-allow hal_bluetooth_default ramdump_vendor_data_file:file create_file_perms;
-allow hal_bluetooth_default ramdump_vendor_data_file:dir create_dir_perms;
+allow hal_bluetooth_default vendor_ramdump_vendor_data_file:file create_file_perms;
+allow hal_bluetooth_default vendor_ramdump_vendor_data_file:dir create_dir_perms;
allow hal_bluetooth_default proc_sysrq:file rw_file_perms;
-allow hal_bluetooth_default debugfs_ipc:file rw_file_perms;
-allow hal_bluetooth_default debugfs_ipc:dir rw_dir_perms;
+allow hal_bluetooth_default vendor_debugfs_ipc:file rw_file_perms;
+allow hal_bluetooth_default vendor_debugfs_ipc:dir rw_dir_perms;
allow hal_bluetooth_default vendor_bt_data_file:dir ra_dir_perms;
allow hal_bluetooth_default vendor_bt_data_file:file create_file_perms;
allow hal_bluetooth_default self:{ socket } create_socket_perms_no_ioctl;
diff --git a/generic/vendor/common/hal_bootctl.te b/generic/vendor/common/hal_bootctl.te
index 7e6e3e1..ac85d35 100644
--- a/generic/vendor/common/hal_bootctl.te
+++ b/generic/vendor/common/hal_bootctl.te
@@ -32,24 +32,24 @@
allow hal_bootctl block_device:dir r_dir_perms;
# Edit the attributes stored in the GPT.
-allow hal_bootctl gpt_block_device:blk_file rw_file_perms;
+allow hal_bootctl vendor_gpt_block_device:blk_file rw_file_perms;
allow hal_bootctl root_block_device:blk_file rw_file_perms;
# Allow boot_control_hal to get attributes on all the A/B partitions.
allow hal_bootctl boot_block_device:blk_file rw_file_perms;
-allow hal_bootctl ab_block_device:blk_file getattr;
-allow hal_bootctl xbl_block_device:blk_file getattr;
-allow hal_bootctl modem_block_device:blk_file getattr;
+allow hal_bootctl vendor_ab_block_device:blk_file getattr;
+allow hal_bootctl vendor_xbl_block_device:blk_file getattr;
+allow hal_bootctl vendor_modem_block_device:blk_file getattr;
allow hal_bootctl system_block_device:blk_file getattr;
-allow hal_bootctl custom_ab_block_device:blk_file getattr;
+allow hal_bootctl vendor_ab_block_device:blk_file getattr;
allow hal_bootctl recovery_block_device:blk_file getattr;
-allow hal_bootctl mdtp_device:blk_file getattr;
+allow hal_bootctl vendor_mdtp_device:blk_file getattr;
allow hal_bootctl_server misc_block_device:blk_file rw_file_perms;
# Access /dev/sgN devices (generic SCSI) to write the
# A/B slot selection for the XBL partition. Allow also to issue a
# UFS_IOCTL_QUERY ioctl.
-allow hal_bootctl sg_device:chr_file rw_file_perms;
+allow hal_bootctl vendor_sg_device:chr_file rw_file_perms;
# The sys_rawio denial message is benign, and shows up due to a capability()
# call made by the scsi driver to check for CAP_SYS_RAWIO. Not having this
@@ -58,7 +58,7 @@
# Read the sysfs to lookup what /dev/sgN device
# corresponds to the XBL partitions.
-allow hal_bootctl sysfs_scsi_target:dir r_dir_perms;
+allow hal_bootctl vendor_sysfs_scsi_target:dir r_dir_perms;
# Write to the XBL devices.
-allow hal_bootctl xbl_block_device:blk_file rw_file_perms;
+allow hal_bootctl vendor_xbl_block_device:blk_file rw_file_perms;
diff --git a/generic/vendor/common/hal_camera.te b/generic/vendor/common/hal_camera.te
index b423db4..19e4d0f 100644
--- a/generic/vendor/common/hal_camera.te
+++ b/generic/vendor/common/hal_camera.te
@@ -32,7 +32,7 @@
hal_client_domain(hal_camera_default, hal_graphics_allocator)
# This is needed to get performance boost
-hal_client_domain(hal_camera_default, hal_perf)
+hal_client_domain(hal_camera_default, vendor_hal_perf)
set_prop(hal_camera, vendor_camera_prop)
@@ -41,22 +41,22 @@
allow hal_camera vendor_camera_data_file:dir rw_dir_perms;
allow hal_camera vendor_camera_data_file:file create_file_perms;
-unix_socket_connect(hal_camera, thermal, thermal-engine)
+unix_socket_connect(hal_camera, vendor_thermal, vendor_thermal-engine)
userdebug_or_eng(`
- allow hal_camera diag_device:chr_file rw_file_perms;
+ allow hal_camera vendor_diag_device:chr_file rw_file_perms;
')
# access hexagon
-allow hal_camera qdsp_device:chr_file r_file_perms;
+allow hal_camera vendor_qdsp_device:chr_file r_file_perms;
#Allow camera to access synx device
-allow hal_camera synx_device:chr_file rw_file_perms;
+allow hal_camera vendor_synx_device:chr_file rw_file_perms;
#needed for full_treble
hal_client_domain(hal_camera_default, hal_graphics_composer)
-r_dir_file(hal_camera_default, sysfs_graphics)
+r_dir_file(hal_camera_default, vendor_sysfs_graphics)
#allow camera to access /dsp
r_dir_file(hal_camera, adsprpcd_file);
@@ -67,4 +67,4 @@
allow hal_camera_default gpu_device:chr_file rw_file_perms;
# Postproc Service
-hal_attribute_hwservice(hal_camera, hal_camera_postproc_hwservice);
+hal_attribute_hwservice(hal_camera, vendor_hal_camera_postproc_hwservice);
diff --git a/generic/vendor/common/hal_contexthub.te b/generic/vendor/common/hal_contexthub.te
index 946ae78..0df468a 100644
--- a/generic/vendor/common/hal_contexthub.te
+++ b/generic/vendor/common/hal_contexthub.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Allow context hub HAL to communicate with daemon via socket
-unix_socket_connect(hal_contexthub, chre, chre)
\ No newline at end of file
+unix_socket_connect(hal_contexthub, vendor_chre, vendor_chre)
diff --git a/generic/vendor/common/hal_display_color.te b/generic/vendor/common/hal_display_color.te
index 80020ee..bcaa1d2 100644
--- a/generic/vendor/common/hal_display_color.te
+++ b/generic/vendor/common/hal_display_color.te
@@ -26,31 +26,31 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Define domain
-type hal_display_color_default, domain;
-hal_server_domain(hal_display_color_default, hal_display_color)
-type hal_display_color_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_display_color_default)
+type vendor_hal_display_color_default, domain;
+hal_server_domain(vendor_hal_display_color_default, vendor_hal_display_color)
+type vendor_hal_display_color_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_display_color_default)
# Allow hwbinder call from hal client to server
-binder_call(hal_display_color_client, hal_display_color_server)
-binder_call(platform_app, hal_display_color_server)
+binder_call(vendor_hal_display_color_client, vendor_hal_display_color_server)
+binder_call(platform_app, vendor_hal_display_color_server)
# Add hwservice related rules
-add_hwservice(hal_display_color_server, hal_display_color_hwservice)
-allow hal_display_color_client hal_display_color_hwservice:hwservice_manager find;
-allow platform_app hal_display_color_hwservice:hwservice_manager find;
+add_hwservice(vendor_hal_display_color_server, vendor_hal_display_color_hwservice)
+allow vendor_hal_display_color_client vendor_hal_display_color_hwservice:hwservice_manager find;
+allow platform_app vendor_hal_display_color_hwservice:hwservice_manager find;
# Rule for display color to access graphics composer process
-unix_socket_connect(hal_display_color, pps, hal_graphics_composer_default);
+unix_socket_connect(vendor_hal_display_color, vendor_pps, hal_graphics_composer_default);
# Rule for vndbinder usage
-allow hal_display_color qdisplay_service:service_manager find;
-vndbinder_use(hal_display_color);
-binder_call(hal_display_color, hal_graphics_composer)
+allow vendor_hal_display_color vendor_qdisplay_service:service_manager find;
+vndbinder_use(vendor_hal_display_color);
+binder_call(vendor_hal_display_color, hal_graphics_composer)
#Add rules for postproc hal
-add_hwservice(hal_display_color_server, hal_display_postproc_hwservice)
-allow hal_display_postproc_client hal_display_postproc_hwservice:hwservice_manager find;
+add_hwservice(vendor_hal_display_color_server, vendor_hal_display_postproc_hwservice)
+allow vendor_hal_display_postproc_client vendor_hal_display_postproc_hwservice:hwservice_manager find;
# Set vendor_qdcmss property
-set_prop(hal_display_color, vendor_qdcmss_prop);
+set_prop(vendor_hal_display_color, vendor_qdcmss_prop);
diff --git a/generic/vendor/common/hal_drm_widevine.te b/generic/vendor/common/hal_drm_widevine.te
index 505518e..6589f33 100644
--- a/generic/vendor/common/hal_drm_widevine.te
+++ b/generic/vendor/common/hal_drm_widevine.te
@@ -26,24 +26,24 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# define SELinux domain
-type hal_drm_widevine, domain;
-hal_server_domain(hal_drm_widevine, hal_drm)
+type vendor_hal_drm_widevine, domain;
+hal_server_domain(vendor_hal_drm_widevine, hal_drm)
-type hal_drm_widevine_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_drm_widevine)
+type vendor_hal_drm_widevine_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_drm_widevine)
-allow hal_drm_widevine mediacodec:fd use;
-allow hal_drm_widevine { appdomain -isolated_app }:fd use;
-allow hal_drm_widevine qce_device:chr_file rw_file_perms;
+allow vendor_hal_drm_widevine mediacodec:fd use;
+allow vendor_hal_drm_widevine { appdomain -isolated_app }:fd use;
+allow vendor_hal_drm_widevine vendor_qce_device:chr_file rw_file_perms;
#Allow access to smcinvoke device
-allow hal_drm_widevine smcinvoke_device:chr_file rw_file_perms;
+allow vendor_hal_drm_widevine smcinvoke_device:chr_file rw_file_perms;
# The QTI DRM-HAL implementation uses a vendor-binder service provided
# by the HWC HAL.
-vndbinder_use(hal_drm_widevine);
-allow hal_drm_widevine qdisplay_service:service_manager { find };
-#binder_call(hal_drm_widevine, hal_graphics_composer)
-hal_client_domain(hal_drm_widevine, hal_graphics_composer);
-allow hal_drm_widevine mediadrm_vendor_data_file:dir create_dir_perms;
-allow hal_drm_widevine mediadrm_vendor_data_file:file create_file_perms;
+vndbinder_use(vendor_hal_drm_widevine);
+allow vendor_hal_drm_widevine vendor_qdisplay_service:service_manager { find };
+#binder_call(vendor_hal_drm_widevine, hal_graphics_composer)
+hal_client_domain(vendor_hal_drm_widevine, hal_graphics_composer);
+allow vendor_hal_drm_widevine vendor_mediadrm_vendor_data_file:dir create_dir_perms;
+allow vendor_hal_drm_widevine vendor_mediadrm_vendor_data_file:file create_file_perms;
diff --git a/generic/vendor/common/hal_gatekeeper_qti.te b/generic/vendor/common/hal_gatekeeper_qti.te
index 6c57205..aa6ce85 100644
--- a/generic/vendor/common/hal_gatekeeper_qti.te
+++ b/generic/vendor/common/hal_gatekeeper_qti.te
@@ -24,12 +24,12 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_gatekeeper_qti, domain;
-hal_server_domain(hal_gatekeeper_qti, hal_gatekeeper)
+type vendor_hal_gatekeeper_qti, domain;
+hal_server_domain(vendor_hal_gatekeeper_qti, hal_gatekeeper)
-type hal_gatekeeper_qti_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_gatekeeper_qti)
+type vendor_hal_gatekeeper_qti_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_gatekeeper_qti)
-dontaudit hal_gatekeeper_qti firmware_file:dir search;
+dontaudit vendor_hal_gatekeeper_qti firmware_file:dir search;
-get_prop(hal_gatekeeper_qti, vendor_tee_listener_prop)
+get_prop(vendor_hal_gatekeeper_qti, vendor_tee_listener_prop)
diff --git a/generic/vendor/common/hal_gnss_qti.te b/generic/vendor/common/hal_gnss_qti.te
index 3b49fbd..ff32346 100644
--- a/generic/vendor/common/hal_gnss_qti.te
+++ b/generic/vendor/common/hal_gnss_qti.te
@@ -25,30 +25,30 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# generic/hal_gnss_qti.te - generic sepolicy rules for location hidl
+# generic/vendor_hal_gnss_qti.te - generic sepolicy rules for vendor_location hidl
-type hal_gnss_qti, domain;
-hal_server_domain(hal_gnss_qti, hal_gnss)
+type vendor_hal_gnss_qti, domain;
+hal_server_domain(vendor_hal_gnss_qti, hal_gnss)
-type hal_gnss_qti_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_gnss_qti)
+type vendor_hal_gnss_qti_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_gnss_qti)
# vendor binder
-use_vendor_per_mgr(hal_gnss_qti)
+use_vendor_per_mgr(vendor_hal_gnss_qti)
-# /data/vendor/location
-allow hal_gnss_qti location_data_file:fifo_file { open read setattr write };
-allow hal_gnss_qti location_data_file:dir create_dir_perms;
-allow hal_gnss_qti location_data_file:file create_file_perms;
+# /data/vendor/vendor_location
+allow vendor_hal_gnss_qti vendor_location_data_file:fifo_file { open read setattr write };
+allow vendor_hal_gnss_qti vendor_location_data_file:dir create_dir_perms;
+allow vendor_hal_gnss_qti vendor_location_data_file:file create_file_perms;
-# /dev/socket/location
-allow hal_gnss_qti location_socket:sock_file create_file_perms;
-allow hal_gnss_qti location_socket:dir rw_dir_perms;
-allow hal_gnss_qti location:unix_stream_socket connectto;
-allow hal_gnss_qti location:unix_dgram_socket sendto;
+# /dev/socket/vendor_location
+allow vendor_hal_gnss_qti vendor_location_socket:sock_file create_file_perms;
+allow vendor_hal_gnss_qti vendor_location_socket:dir rw_dir_perms;
+allow vendor_hal_gnss_qti vendor_location:unix_stream_socket connectto;
+allow vendor_hal_gnss_qti vendor_location:unix_dgram_socket sendto;
# Allow Gnss HAL to get updates from health hal
-hal_client_domain(hal_gnss_qti, hal_health)
+hal_client_domain(vendor_hal_gnss_qti, hal_health)
# Most HALs are not allowed to use network sockets. QTI library
# libqdi is used across multiple processes which are clients of
@@ -61,4 +61,4 @@
# TODO (b/37730994) Remove udp_socket requirement from
# libqdi and have all its clients use netlink route
# sockets.
-dontaudit hal_gnss_qti self:udp_socket create;
+dontaudit vendor_hal_gnss_qti self:udp_socket create;
diff --git a/generic/vendor/common/hal_graphics_composer_default.te b/generic/vendor/common/hal_graphics_composer_default.te
index 4b7cd88..2a4706e 100644
--- a/generic/vendor/common/hal_graphics_composer_default.te
+++ b/generic/vendor/common/hal_graphics_composer_default.te
@@ -27,17 +27,17 @@
# Binder access (for display.qservice)
vndbinder_use(hal_graphics_composer_default)
hal_client_domain(hal_graphics_composer_default, hal_graphics_allocator);
-allow hal_graphics_composer_default qdisplay_service:service_manager { add find };
+allow hal_graphics_composer_default vendor_qdisplay_service:service_manager { add find };
-allow hal_graphics_composer_default persist_display_file:dir search;
-allow hal_graphics_composer_default persist_display_file:file r_file_perms;
+allow hal_graphics_composer_default vendor_persist_display_file:dir search;
+allow hal_graphics_composer_default vendor_persist_display_file:file r_file_perms;
# Allow reading/writing to '/mnt/vendor/persist/display/*'
-allow hal_graphics_composer_default persist_display_file:dir rw_dir_perms;
-allow hal_graphics_composer_default persist_display_file:file create_file_perms;
+allow hal_graphics_composer_default vendor_persist_display_file:dir rw_dir_perms;
+allow hal_graphics_composer_default vendor_persist_display_file:file create_file_perms;
-allow hal_graphics_composer sysfs_graphics:dir r_dir_perms;
-allow hal_graphics_composer sysfs_graphics:file rw_file_perms;
+allow hal_graphics_composer vendor_sysfs_graphics:dir r_dir_perms;
+allow hal_graphics_composer vendor_sysfs_graphics:file rw_file_perms;
allow hal_graphics_composer_default mnt_vendor_file:dir search;
allow hal_graphics_composer oemfs:dir r_dir_perms;
@@ -62,18 +62,18 @@
r_dir_file(hal_graphics_composer_default, sysfs_type)
# Allow reading/writing to '/data/vendor/display/*'
-allow hal_graphics_composer_default display_vendor_data_file:dir create_dir_perms;
-allow hal_graphics_composer_default display_vendor_data_file:file create_file_perms;
+allow hal_graphics_composer_default vendor_display_vendor_data_file:dir create_dir_perms;
+allow hal_graphics_composer_default vendor_display_vendor_data_file:file create_file_perms;
userdebug_or_eng(`
- allow hal_graphics_composer_default debugfs_mdp:dir r_dir_perms;
- allow hal_graphics_composer_default debugfs_mdp:file r_file_perms;
+ allow hal_graphics_composer_default vendor_debugfs_mdp:dir r_dir_perms;
+ allow hal_graphics_composer_default vendor_debugfs_mdp:file r_file_perms;
')
userdebug_or_eng(`
# Allow read to /sys/kernel/debug/*
- allow hal_graphics_composer qti_display_debugfs:dir r_dir_perms;
- allow hal_graphics_composer qti_display_debugfs:file r_file_perms;
+ allow hal_graphics_composer vendor_qti_display_debugfs:dir r_dir_perms;
+ allow hal_graphics_composer vendor_qti_display_debugfs:file r_file_perms;
')
# Allow sensor service access
@@ -81,9 +81,9 @@
binder_call(hal_graphics_composer, system_server)
# allow composer to register display config
-add_hwservice(hal_graphics_composer_server, hal_display_config_hwservice);
+add_hwservice(hal_graphics_composer_server, vendor_hal_display_config_hwservice);
# allow composer client to find display config service.
-allow hal_graphics_composer_client hal_display_config_hwservice:hwservice_manager find;
+allow hal_graphics_composer_client vendor_hal_display_config_hwservice:hwservice_manager find;
# Allow qdcmss socket access
-unix_socket_connect(hal_graphics_composer_default, qdcmsocket, qdcm-ss)
+unix_socket_connect(hal_graphics_composer_default, vendor_qdcmsocket, vendor_qdcm-ss)
diff --git a/generic/vendor/common/hal_health.te b/generic/vendor/common/hal_health.te
index fbbf404..83d699a 100644
--- a/generic/vendor/common/hal_health.te
+++ b/generic/vendor/common/hal_health.te
@@ -25,12 +25,12 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-r_dir_file(hal_health, sysfs_battery_supply);
-r_dir_file(hal_health, sysfs_usb_supply);
+r_dir_file(hal_health, vendor_sysfs_battery_supply);
+r_dir_file(hal_health, vendor_sysfs_usb_supply);
allow hal_health hal_health_default:dir search;
allow hal_health {
- sysfs_battery_supply
- sysfs_usb_supply
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
}:file rw_file_perms;
diff --git a/generic/vendor/common/hal_imsrtp.te b/generic/vendor/common/hal_imsrtp.te
index 07bc27f..f544e94 100644
--- a/generic/vendor/common/hal_imsrtp.te
+++ b/generic/vendor/common/hal_imsrtp.te
@@ -24,29 +24,29 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ims rtp service
-type hal_imsrtp, domain;
-type hal_imsrtp_exec, exec_type, vendor_file_type, file_type;
+#vendor_ims rtp service
+type vendor_hal_imsrtp, domain;
+type vendor_hal_imsrtp_exec, exec_type, vendor_file_type, file_type;
# Started by init
-init_daemon_domain(hal_imsrtp)
-net_domain(hal_imsrtp)
+init_daemon_domain(vendor_hal_imsrtp)
+net_domain(vendor_hal_imsrtp)
-hwbinder_use(hal_imsrtp)
-get_prop(hal_imsrtp, hwservicemanager_prop)
-add_hwservice(hal_imsrtp, hal_imsrtp_hwservice)
+hwbinder_use(vendor_hal_imsrtp)
+get_prop(vendor_hal_imsrtp, hwservicemanager_prop)
+add_hwservice(vendor_hal_imsrtp, vendor_hal_imsrtp_hwservice)
-allow hal_imsrtp self: qipcrtr_socket create_socket_perms_no_ioctl;
-unix_socket_connect(hal_imsrtp, ims, ims)
+allow vendor_hal_imsrtp self: qipcrtr_socket create_socket_perms_no_ioctl;
+unix_socket_connect(vendor_hal_imsrtp, vendor_ims, vendor_ims)
-allow hal_imsrtp sysfs_timestamp_switch:file r_file_perms;
+allow vendor_hal_imsrtp vendor_sysfs_timestamp_switch:file r_file_perms;
-allow hal_imsrtp self:capability net_bind_service;
+allow vendor_hal_imsrtp self:capability net_bind_service;
-allow hal_imsrtp sysfs_timestamp_switch:file r_file_perms;
-allow hal_imsrtp ion_device:chr_file r_file_perms;
-allow hal_imsrtp sysfs_data:file r_file_perms;
-r_dir_file(hal_imsrtp, sysfs_diag)
+allow vendor_hal_imsrtp vendor_sysfs_timestamp_switch:file r_file_perms;
+allow vendor_hal_imsrtp ion_device:chr_file r_file_perms;
+allow vendor_hal_imsrtp vendor_sysfs_data:file r_file_perms;
+r_dir_file(vendor_hal_imsrtp, vendor_sysfs_diag)
-get_prop(hal_imsrtp, ims_prop)
-binder_call(hal_imsrtp, radio)
+get_prop(vendor_hal_imsrtp, vendor_ims_prop)
+binder_call(vendor_hal_imsrtp, radio)
diff --git a/generic/vendor/common/hal_keymaster_qti.te b/generic/vendor/common/hal_keymaster_qti.te
index 3aa9061..b9f6f33 100644
--- a/generic/vendor/common/hal_keymaster_qti.te
+++ b/generic/vendor/common/hal_keymaster_qti.te
@@ -24,12 +24,12 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_keymaster_qti, domain;
-hal_server_domain(hal_keymaster_qti, hal_keymaster)
+type vendor_hal_keymaster_qti, domain;
+hal_server_domain(vendor_hal_keymaster_qti, hal_keymaster)
-type hal_keymaster_qti_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_keymaster_qti)
+type vendor_hal_keymaster_qti_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_keymaster_qti)
-dontaudit hal_keymaster_qti firmware_file:dir search;
+dontaudit vendor_hal_keymaster_qti firmware_file:dir search;
-get_prop(hal_keymaster_qti, vendor_tee_listener_prop)
+get_prop(vendor_hal_keymaster_qti, vendor_tee_listener_prop)
diff --git a/generic/vendor/common/hal_light.te b/generic/vendor/common/hal_light.te
index c536c5e..7784c62 100644
--- a/generic/vendor/common/hal_light.te
+++ b/generic/vendor/common/hal_light.te
@@ -24,5 +24,5 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_light sysfs_graphics:dir search;
-allow hal_light sysfs_graphics:file rw_file_perms;
+allow hal_light vendor_sysfs_graphics:dir search;
+allow hal_light vendor_sysfs_graphics:file rw_file_perms;
diff --git a/generic/vendor/common/hal_memtrack_default.te b/generic/vendor/common/hal_memtrack_default.te
index 8f5cfa7..e396946 100644
--- a/generic/vendor/common/hal_memtrack_default.te
+++ b/generic/vendor/common/hal_memtrack_default.te
@@ -26,6 +26,6 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#Acess to kgsl memory /sys/class/kgsl/kgsl/proc/<pid>/mtrack
-r_dir_file(hal_memtrack_default, sysfs_kgsl_proc);
+r_dir_file(hal_memtrack_default, vendor_sysfs_kgsl_proc);
-allow hal_memtrack_default sysfs_kgsl:dir search;
+allow hal_memtrack_default vendor_sysfs_kgsl:dir search;
diff --git a/generic/vendor/common/hal_neuralnetworks.te b/generic/vendor/common/hal_neuralnetworks.te
index 3cf5386..6cab921 100644
--- a/generic/vendor/common/hal_neuralnetworks.te
+++ b/generic/vendor/common/hal_neuralnetworks.te
@@ -25,22 +25,22 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_neuralnetworks_default, domain;
-hal_server_domain(hal_neuralnetworks_default, hal_neuralnetworks)
+type vendor_hal_neuralnetworks_default, domain;
+hal_server_domain(vendor_hal_neuralnetworks_default, hal_neuralnetworks)
-type hal_neuralnetworks_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_neuralnetworks_default)
+type vendor_hal_neuralnetworks_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_neuralnetworks_default)
-allow hal_neuralnetworks_default fwk_sensor_hwservice:hwservice_manager find;
-allow hal_neuralnetworks_default qdsp_device:chr_file r_file_perms;
-allow hal_neuralnetworks_default xdsp_device:chr_file r_file_perms;
-allow hal_neuralnetworks_default ion_device:chr_file r_file_perms;
+allow vendor_hal_neuralnetworks_default fwk_sensor_hwservice:hwservice_manager find;
+allow vendor_hal_neuralnetworks_default vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_hal_neuralnetworks_default vendor_xdsp_device:chr_file r_file_perms;
+allow vendor_hal_neuralnetworks_default ion_device:chr_file r_file_perms;
-allow hal_neuralnetworks_default app_data_file:file { read getattr map };
-allow hal_neuralnetworks_default shell_data_file:file { read getattr map };
-allow hal_neuralnetworks_default hal_neuralnetworks_data_file:dir create_dir_perms;
-allow hal_neuralnetworks_default hal_neuralnetworks_data_file:{ file fifo_file } create_file_perms;
-allow hal_neuralnetworks_default gpu_device:chr_file rw_file_perms;
-allow hal_neuralnetworks_default npu_device:chr_file r_file_perms;
+allow vendor_hal_neuralnetworks_default app_data_file:file { read getattr map };
+allow vendor_hal_neuralnetworks_default shell_data_file:file { read getattr map };
+allow vendor_hal_neuralnetworks_default vendor_hal_neuralnetworks_data_file:dir create_dir_perms;
+allow vendor_hal_neuralnetworks_default vendor_hal_neuralnetworks_data_file:{ file fifo_file } create_file_perms;
+allow vendor_hal_neuralnetworks_default gpu_device:chr_file rw_file_perms;
+allow vendor_hal_neuralnetworks_default vendor_npu_device:chr_file r_file_perms;
-r_dir_file(hal_neuralnetworks_default, adsprpcd_file)
+r_dir_file(vendor_hal_neuralnetworks_default, adsprpcd_file)
diff --git a/generic/vendor/common/hal_power_default.te b/generic/vendor/common/hal_power_default.te
index bc10a9f..6f16e8a 100644
--- a/generic/vendor/common/hal_power_default.te
+++ b/generic/vendor/common/hal_power_default.te
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_power_default hbtp_kernel_sysfs:file rw_file_perms;
+allow hal_power_default vendor_hbtp_kernel_sysfs:file rw_file_perms;
-hal_client_domain(hal_power_default, hal_perf)
+hal_client_domain(hal_power_default, vendor_hal_perf)
diff --git a/generic/vendor/common/hal_qdutils_disp_qti.te b/generic/vendor/common/hal_qdutils_disp_qti.te
index 7b417d4..0625f48 100644
--- a/generic/vendor/common/hal_qdutils_disp_qti.te
+++ b/generic/vendor/common/hal_qdutils_disp_qti.te
@@ -25,18 +25,18 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_qdutils_disp_qti, domain;
-hal_server_domain(hal_qdutils_disp_qti, hal_qdutils_disp)
+type vendor_hal_qdutils_disp_qti, domain;
+hal_server_domain(vendor_hal_qdutils_disp_qti, vendor_hal_qdutils_disp)
-type hal_qdutils_disp_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_qdutils_disp_qti)
+type vendor_hal_qdutils_disp_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_qdutils_disp_qti)
-binder_call(hal_qdutils_disp_client, hal_qdutils_disp_server)
-binder_call(hal_qdutils_disp_server, hal_qdutils_disp_client)
+binder_call(vendor_hal_qdutils_disp_client, vendor_hal_qdutils_disp_server)
+binder_call(vendor_hal_qdutils_disp_server, vendor_hal_qdutils_disp_client)
-add_hwservice(hal_qdutils_disp_server, hal_qdutils_disp_hwservice)
-allow hal_qdutils_disp_client hal_qdutils_disp_hwservice:hwservice_manager find;
-vndbinder_use(hal_qdutils_disp_qti);
-allow hal_qdutils_disp_qti qdisplay_service:service_manager find;
-#hal_client_domain(hal_qdutils_disp_qti, hal_display_config);
-hal_client_domain(hal_qdutils_disp_qti, hal_graphics_composer);
+add_hwservice(vendor_hal_qdutils_disp_server, vendor_hal_qdutils_disp_hwservice)
+allow vendor_hal_qdutils_disp_client vendor_hal_qdutils_disp_hwservice:hwservice_manager find;
+vndbinder_use(vendor_hal_qdutils_disp_qti);
+allow vendor_hal_qdutils_disp_qti vendor_qdisplay_service:service_manager find;
+#hal_client_domain(vendor_hal_qdutils_disp_qti, hal_display_config);
+hal_client_domain(vendor_hal_qdutils_disp_qti, hal_graphics_composer);
diff --git a/generic/vendor/common/hal_rcsservice.te b/generic/vendor/common/hal_rcsservice.te
index 7debd7a..ac4767e 100644
--- a/generic/vendor/common/hal_rcsservice.te
+++ b/generic/vendor/common/hal_rcsservice.te
@@ -24,46 +24,46 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_rcsservice, domain;
-type hal_rcsservice_exec, exec_type, vendor_file_type, file_type;
+type vendor_hal_rcsservice, domain;
+type vendor_hal_rcsservice_exec, exec_type, vendor_file_type, file_type;
# Started by init
-init_daemon_domain(hal_rcsservice)
-net_domain(hal_rcsservice)
+init_daemon_domain(vendor_hal_rcsservice)
+net_domain(vendor_hal_rcsservice)
-get_prop(hal_rcsservice, ims_prop)
-set_prop(hal_rcsservice, ims_prop)
+get_prop(vendor_hal_rcsservice, vendor_ims_prop)
+set_prop(vendor_hal_rcsservice, vendor_ims_prop)
# To register imsrcsd to hwBinder
-hwbinder_use(hal_rcsservice)
+hwbinder_use(vendor_hal_rcsservice)
# add IUceSerive and IService to Hidl interface
-add_hwservice(hal_rcsservice, hal_imsrcsd_hwservice)
-add_hwservice(hal_rcsservice, hal_imscallinfo_hwservice)
+add_hwservice(vendor_hal_rcsservice, vendor_hal_imsrcsd_hwservice)
+add_hwservice(vendor_hal_rcsservice, vendor_hal_imscallinfo_hwservice)
-get_prop(hal_rcsservice, hwservicemanager_prop)
+get_prop(vendor_hal_rcsservice, hwservicemanager_prop)
-allow hal_rcsservice sysfs_timestamp_switch:file r_file_perms;
-allow hal_rcsservice sysfs_data:file r_file_perms;
-allow hal_rcsservice self: { socket qipcrtr_socket } create_socket_perms_no_ioctl;
+allow vendor_hal_rcsservice vendor_sysfs_timestamp_switch:file r_file_perms;
+allow vendor_hal_rcsservice vendor_sysfs_data:file r_file_perms;
+allow vendor_hal_rcsservice self: { socket qipcrtr_socket } create_socket_perms_no_ioctl;
#required for socket creation
-unix_socket_connect(hal_rcsservice, ims, ims)
+unix_socket_connect(vendor_hal_rcsservice, vendor_ims, vendor_ims)
# imsrcsd to bind with UceShimService.apk
-binder_call(hal_rcsservice, dataservice_app)
+binder_call(vendor_hal_rcsservice, dataservice_app)
# imsrcsd needs read/write access to devpts
-allow hal_rcsservice devpts:chr_file rw_file_perms;
+allow vendor_hal_rcsservice devpts:chr_file rw_file_perms;
# allow imsrcsd capabilities
-wakelock_use(hal_rcsservice)
-allow hal_rcsservice self:capability net_bind_service;
-allow hal_rcsservice self:capability2 wake_alarm;
+wakelock_use(vendor_hal_rcsservice)
+allow vendor_hal_rcsservice self:capability net_bind_service;
+allow vendor_hal_rcsservice self:capability2 wake_alarm;
#diag
userdebug_or_eng(`
- diag_use(hal_rcsservice)
- binder_call(hal_rcsservice, radio)
+ diag_use(vendor_hal_rcsservice)
+ binder_call(vendor_hal_rcsservice, radio)
')
-set_prop(hal_rcsservice, ctl_vendor_imsrcsservice_prop)
+set_prop(vendor_hal_rcsservice, vendor_ctl_vendor_imsrcsservice_prop)
diff --git a/generic/vendor/common/hal_sensors_default.te b/generic/vendor/common/hal_sensors_default.te
index 9c00420..e04afd7 100644
--- a/generic/vendor/common/hal_sensors_default.te
+++ b/generic/vendor/common/hal_sensors_default.te
@@ -26,31 +26,31 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# read factory calibration and sensor configuration data
allow hal_sensors_default mnt_vendor_file:dir search;
-r_dir_file(hal_sensors_default, persist_sensors_file)
-get_prop(hal_sensors_default, sensors_prop)
+r_dir_file(hal_sensors_default, vendor_persist_sensors_file)
+get_prop(hal_sensors_default, vendor_sensors_prop)
# Access to tests from userdebug/eng builds
userdebug_or_eng(`
diag_use(hal_sensors_default)
- get_prop(hal_sensors_default, sensors_dbg_prop)
- allow hal_sensors_default sysfs_timestamp_switch:file r_file_perms;
+ get_prop(hal_sensors_default, vendor_sensors_dbg_prop)
+ allow hal_sensors_default vendor_sysfs_timestamp_switch:file r_file_perms;
')
-allow hal_sensors_default qdsp_device:chr_file r_file_perms;
-allow hal_sensors_default xdsp_device:chr_file r_file_perms;
+allow hal_sensors_default vendor_qdsp_device:chr_file r_file_perms;
+allow hal_sensors_default vendor_xdsp_device:chr_file r_file_perms;
-allow hal_sensors sysfs_data:file r_file_perms;
-allow hal_sensors sysfs_sensors:dir r_dir_perms;
-allow hal_sensors sysfs_sensors:file rw_file_perms;
-allow hal_sensors sysfs_sensors:lnk_file read;
+allow hal_sensors vendor_sysfs_data:file r_file_perms;
+allow hal_sensors vendor_sysfs_sensors:dir r_dir_perms;
+allow hal_sensors vendor_sysfs_sensors:file rw_file_perms;
+allow hal_sensors vendor_sysfs_sensors:lnk_file read;
#following to set the ssr
-allow hal_sensors_default sysfs_slpi:dir search;
-allow hal_sensors_default sysfs_slpi:file w_file_perms;
-allow hal_sensors_default sysfs_adsp_ssr:file w_file_perms;
+allow hal_sensors_default vendor_sysfs_slpi:dir search;
+allow hal_sensors_default vendor_sysfs_slpi:file w_file_perms;
+allow hal_sensors_default vendor_sysfs_adsp_ssr:file w_file_perms;
-allow hal_sensors_default persist_sensors_file:dir rw_dir_perms;
-allow hal_sensors_default persist_sensors_file:file create_file_perms;
+allow hal_sensors_default vendor_persist_sensors_file:dir rw_dir_perms;
+allow hal_sensors_default vendor_persist_sensors_file:file create_file_perms;
allow hal_sensors_default mnt_vendor_file:dir rw_dir_perms;
allow hal_sensors_default mnt_vendor_file:file create_file_perms;
diff --git a/generic/vendor/common/hal_tetheroffload_default.te b/generic/vendor/common/hal_tetheroffload_default.te
index fc57c07..2fa02f2 100644
--- a/generic/vendor/common/hal_tetheroffload_default.te
+++ b/generic/vendor/common/hal_tetheroffload_default.te
@@ -25,16 +25,16 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_tetheroffload_default ipa_dev:chr_file rw_file_perms;
-allow hal_tetheroffload_default ipacm_socket:sock_file w_file_perms;
+allow hal_tetheroffload_default vendor_ipa_dev:chr_file rw_file_perms;
+allow hal_tetheroffload_default vendor_ipacm_socket:sock_file w_file_perms;
-allow hal_tetheroffload_default ipa_vendor_data_file:dir w_dir_perms;
-allow hal_tetheroffload_default ipa_vendor_data_file:file create_file_perms;
+allow hal_tetheroffload_default vendor_ipa_vendor_data_file:dir w_dir_perms;
+allow hal_tetheroffload_default vendor_ipa_vendor_data_file:file create_file_perms;
#add_hwservice(hal_tetheroffload_default, hal_tetheroffload_hwservice)
#diag
userdebug_or_eng(`
- r_dir_file(hal_tetheroffload_default, sysfs_diag)
- allow hal_tetheroffload_default sysfs_timestamp_switch:file r_file_perms;
+ r_dir_file(hal_tetheroffload_default, vendor_sysfs_diag)
+ allow hal_tetheroffload_default vendor_sysfs_timestamp_switch:file r_file_perms;
')
diff --git a/generic/vendor/common/hal_trustedui_qti.te b/generic/vendor/common/hal_trustedui_qti.te
index e1425e6..d82bd1c 100644
--- a/generic/vendor/common/hal_trustedui_qti.te
+++ b/generic/vendor/common/hal_trustedui_qti.te
@@ -25,27 +25,27 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_trustedui_qti, domain;
-hal_server_domain(hal_trustedui_qti, hal_trustedui)
+type vendor_hal_trustedui_qti, domain;
+hal_server_domain(vendor_hal_trustedui_qti, vendor_hal_trustedui)
-type hal_trustedui_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_trustedui_qti)
+type vendor_hal_trustedui_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_trustedui_qti)
-binder_call(hal_trustedui_client, hal_trustedui_server)
-binder_call(hal_trustedui_server, hal_trustedui_client)
+binder_call(vendor_hal_trustedui_client, vendor_hal_trustedui_server)
+binder_call(vendor_hal_trustedui_server, vendor_hal_trustedui_client)
-hal_attribute_hwservice(hal_trustedui, hal_trustedui_hwservice)
+hal_attribute_hwservice(vendor_hal_trustedui, vendor_hal_trustedui_hwservice)
-hal_client_domain(hal_trustedui_qti, hal_graphics_allocator);
-hal_client_domain(hal_trustedui_qti, hal_graphics_composer);
-hal_client_domain(hal_trustedui_qti, hal_systemhelper);
+hal_client_domain(vendor_hal_trustedui_qti, hal_graphics_allocator);
+hal_client_domain(vendor_hal_trustedui_qti, hal_graphics_composer);
+hal_client_domain(vendor_hal_trustedui_qti, hal_systemhelper);
-allow hal_trustedui_qti sysfs_sectouch:file rw_file_perms;
-allow hal_trustedui_qti vendor_tui_data_file:file rw_file_perms;
-allow hal_trustedui_qti vendor_tui_data_file:dir r_dir_perms;
+allow vendor_hal_trustedui_qti vendor_sysfs_sectouch:file rw_file_perms;
+allow vendor_hal_trustedui_qti vendor_tui_data_file:file rw_file_perms;
+allow vendor_hal_trustedui_qti vendor_tui_data_file:dir r_dir_perms;
-allow hal_trustedui_qti ion_device:chr_file r_file_perms;
-allow hal_trustedui_qti surfaceflinger:fd use;
+allow vendor_hal_trustedui_qti ion_device:chr_file r_file_perms;
+allow vendor_hal_trustedui_qti surfaceflinger:fd use;
-allow hal_trustedui_qti tee_device:chr_file rw_file_perms;
-binder_call(hal_trustedui_qti, systemhelper_app)
+allow vendor_hal_trustedui_qti tee_device:chr_file rw_file_perms;
+binder_call(vendor_hal_trustedui_qti, systemhelper_app)
diff --git a/generic/vendor/common/hal_tui_comm_qti.te b/generic/vendor/common/hal_tui_comm_qti.te
index ce8aecd..a0895f8 100644
--- a/generic/vendor/common/hal_tui_comm_qti.te
+++ b/generic/vendor/common/hal_tui_comm_qti.te
@@ -25,15 +25,15 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_tui_comm_qti, domain;
-hal_server_domain(hal_tui_comm_qti, hal_tui_comm)
+type vendor_hal_tui_comm_qti, domain;
+hal_server_domain(vendor_hal_tui_comm_qti, vendor_hal_tui_comm)
-type hal_tui_comm_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_tui_comm_qti)
+type vendor_hal_tui_comm_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_tui_comm_qti)
-binder_call(hal_tui_comm_client, hal_tui_comm_server)
-binder_call(hal_tui_comm_server, hal_tui_comm_client)
+binder_call(vendor_hal_tui_comm_client, vendor_hal_tui_comm_server)
+binder_call(vendor_hal_tui_comm_server, vendor_hal_tui_comm_client)
-add_hwservice(hal_tui_comm_server, hal_tui_comm_hwservice)
-allow hal_tui_comm_client hal_tui_comm_hwservice:hwservice_manager find;
-hal_client_domain(hal_tui_comm_qti, hal_graphics_allocator);
+add_hwservice(vendor_hal_tui_comm_server, vendor_hal_tui_comm_hwservice)
+allow vendor_hal_tui_comm_client vendor_hal_tui_comm_hwservice:hwservice_manager find;
+hal_client_domain(vendor_hal_tui_comm_qti, hal_graphics_allocator);
diff --git a/generic/vendor/common/hal_usb_default.te b/generic/vendor/common/hal_usb_default.te
index e6d2f3d..b695c5c 100644
--- a/generic/vendor/common/hal_usb_default.te
+++ b/generic/vendor/common/hal_usb_default.te
@@ -25,7 +25,7 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_usb_default sysfs_usbpd_device:dir r_dir_perms;
-allow hal_usb_default sysfs_usbpd_device:lnk_file r_file_perms;
-allow hal_usb_default sysfs_usbpd_device:file rw_file_perms;
-r_dir_file(hal_usb_default, sysfs_usb_supply);
+allow hal_usb_default vendor_sysfs_usbpd_device:dir r_dir_perms;
+allow hal_usb_default vendor_sysfs_usbpd_device:lnk_file r_file_perms;
+allow hal_usb_default vendor_sysfs_usbpd_device:file rw_file_perms;
+r_dir_file(hal_usb_default, vendor_sysfs_usb_supply);
diff --git a/generic/vendor/common/hal_vibrator_default.te b/generic/vendor/common/hal_vibrator_default.te
index 859006f..d65b92a 100644
--- a/generic/vendor/common/hal_vibrator_default.te
+++ b/generic/vendor/common/hal_vibrator_default.te
@@ -28,5 +28,5 @@
allow hal_vibrator_default sysfs_leds:file rw_file_perms;
# read-only permission to obtain the calibration data
-r_dir_file(hal_vibrator_default, persist_haptics_file)
+r_dir_file(hal_vibrator_default, vendor_persist_haptics_file)
allow hal_vibrator_default mnt_vendor_file:dir search;
diff --git a/generic/vendor/common/hal_wifi.te b/generic/vendor/common/hal_wifi.te
index 57f95b4..b2304a0 100644
--- a/generic/vendor/common/hal_wifi.te
+++ b/generic/vendor/common/hal_wifi.te
@@ -28,17 +28,17 @@
#
# allow hal_wifi to write into /proc/debugdriver/driverdump
-r_dir_file(hal_wifi_default, proc_wifi_dbg)
+r_dir_file(hal_wifi_default, vendor_proc_wifi_dbg)
# write to files owned by location daemon
-allow hal_wifi_default location_socket:dir search;
-allow hal_wifi_default location:unix_dgram_socket sendto;
+allow hal_wifi_default vendor_location_socket:dir search;
+allow hal_wifi_default vendor_location:unix_dgram_socket sendto;
-# Connect to location via location socket.
-unix_socket_connect(hal_wifi, location, location)
+# Connect to vendor_location via vendor_location socket.
+unix_socket_connect(hal_wifi, vendor_location, vendor_location)
-allow hal_wifi_default wifihal_socket:dir rw_dir_perms;
-allow hal_wifi_default wifihal_socket:sock_file create_file_perms;
+allow hal_wifi_default vendor_wifihal_socket:dir rw_dir_perms;
+allow hal_wifi_default vendor_wifihal_socket:sock_file create_file_perms;
# Write wlan driver/fw version into property
set_prop(hal_wifi_default, vendor_wifi_version)
diff --git a/generic/vendor/common/hal_wifi_default.te b/generic/vendor/common/hal_wifi_default.te
index ca49f46..3eea24c 100644
--- a/generic/vendor/common/hal_wifi_default.te
+++ b/generic/vendor/common/hal_wifi_default.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_wifi wlan_device:chr_file rw_file_perms;
+allow hal_wifi vendor_wlan_device:chr_file rw_file_perms;
diff --git a/generic/vendor/common/hal_wifi_hostapd.te b/generic/vendor/common/hal_wifi_hostapd.te
index f5d36ef..87adce4 100644
--- a/generic/vendor/common/hal_wifi_hostapd.te
+++ b/generic/vendor/common/hal_wifi_hostapd.te
@@ -28,5 +28,5 @@
#
userdebug_or_eng(`
-allow hal_wifi_hostapd wifi_vendor_log_data_file:dir search;
+allow hal_wifi_hostapd vendor_wifi_vendor_log_data_file:dir search;
')
diff --git a/generic/vendor/common/hal_wifi_supplicant.te b/generic/vendor/common/hal_wifi_supplicant.te
index 3b4a782..cffb540 100644
--- a/generic/vendor/common/hal_wifi_supplicant.te
+++ b/generic/vendor/common/hal_wifi_supplicant.te
@@ -37,7 +37,7 @@
allow hal_wifi_supplicant_default wpa_data_file:file create_file_perms;
# Permission for wpa socket which IMS use to communicate
# # Allow wpa_supplicant to send back wifi information to cnd
-allow hal_wifi_supplicant_default { cnd ims }:unix_dgram_socket sendto;
-# # Allow wpa_supplicant to send back wifi information to location
-allow hal_wifi_supplicant_default location:unix_dgram_socket sendto;
+allow hal_wifi_supplicant_default { vendor_cnd vendor_ims }:unix_dgram_socket sendto;
+# # Allow wpa_supplicant to send back wifi information to vendor_location
+allow hal_wifi_supplicant_default vendor_location:unix_dgram_socket sendto;
diff --git a/generic/vendor/common/hbtp.te b/generic/vendor/common/hbtp.te
index 51a11b0..05fbc50 100644
--- a/generic/vendor/common/hbtp.te
+++ b/generic/vendor/common/hbtp.te
@@ -24,60 +24,60 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Policies for hbtp (host based touch processing)
-type hbtp, domain;
-type hbtp_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hbtp)
-hal_server_domain(hbtp, hal_hbtp)
-# Allow access for /dev/hbtp_input and /dev/jdi-bu21150
-allow hbtp { hbtp_device qdsp_device dsp_device bu21150_device xdsp_device }:chr_file rw_file_perms;
+# Policies for vendor_hbtp (host based touch processing)
+type vendor_hbtp, domain;
+type vendor_hbtp_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hbtp)
+hal_server_domain(vendor_hbtp, vendor_hal_hbtp)
+# Allow access for /dev/vendor_hbtp_input and /dev/jdi-bu21150
+allow vendor_hbtp { vendor_hbtp_device vendor_qdsp_device vendor_dsp_device vendor_bu21150_device vendor_xdsp_device }:chr_file rw_file_perms;
-allow hbtp hbtp_log_file:dir rw_dir_perms;
-allow hbtp hbtp_log_file:file create_file_perms;
+allow vendor_hbtp vendor_hbtp_log_file:dir rw_dir_perms;
+allow vendor_hbtp vendor_hbtp_log_file:file create_file_perms;
-allow hbtp hbtp_cfg_file:dir r_dir_perms;
-allow hbtp hbtp_cfg_file:file r_file_perms;
+allow vendor_hbtp vendor_hbtp_cfg_file:dir r_dir_perms;
+allow vendor_hbtp vendor_hbtp_cfg_file:file r_file_perms;
-allow hbtp firmware_file:dir r_dir_perms;
-allow hbtp firmware_file:file r_file_perms;
+allow vendor_hbtp firmware_file:dir r_dir_perms;
+allow vendor_hbtp firmware_file:file r_file_perms;
-allow hbtp vendor_firmware_file:dir r_dir_perms;
-allow hbtp vendor_firmware_file:file r_file_perms;
+allow vendor_hbtp vendor_firmware_file:dir r_dir_perms;
+allow vendor_hbtp vendor_firmware_file:file r_file_perms;
-allow hbtp sysfs_usb_supply:file r_file_perms;
-allow hbtp sysfs_usb_supply:dir r_dir_perms;
+allow vendor_hbtp vendor_sysfs_usb_supply:file r_file_perms;
+allow vendor_hbtp vendor_sysfs_usb_supply:dir r_dir_perms;
-allow hbtp hbtp_kernel_sysfs:file rw_file_perms;
+allow vendor_hbtp vendor_hbtp_kernel_sysfs:file rw_file_perms;
-allow hbtp sysfs_graphics:file r_file_perms;
-allow hbtp sysfs_graphics:dir r_dir_perms;
+allow vendor_hbtp vendor_sysfs_graphics:file r_file_perms;
+allow vendor_hbtp vendor_sysfs_graphics:dir r_dir_perms;
-allow hbtp sysfs_battery_supply:file r_file_perms;
-allow hbtp sysfs_battery_supply:dir r_dir_perms;
+allow vendor_hbtp vendor_sysfs_battery_supply:file r_file_perms;
+allow vendor_hbtp vendor_sysfs_battery_supply:dir r_dir_perms;
-allow hbtp ion_device:chr_file r_file_perms;
+allow vendor_hbtp ion_device:chr_file r_file_perms;
-allow hbtp self:netlink_kobject_uevent_socket { create read setopt bind };
+allow vendor_hbtp self:netlink_kobject_uevent_socket { create read setopt bind };
# Allow the service to access wakelock sysfs
-allow hbtp sysfs_wake_lock:file r_file_perms;
+allow vendor_hbtp sysfs_wake_lock:file r_file_perms;
# Allow the service to change to system from root
-allow hbtp self:capability { setgid setuid sys_nice };
+allow vendor_hbtp self:capability { setgid setuid sys_nice };
# Allow load touch driver as touchPD
-r_dir_file(hbtp, adsprpcd_file)
+r_dir_file(vendor_hbtp, adsprpcd_file)
#allow the service to read adsprpc_prop
-get_prop(hbtp, vendor_adsprpc_prop)
+get_prop(vendor_hbtp, vendor_adsprpc_prop)
# Allow the service to access wakelock capability
-wakelock_use(hbtp)
+wakelock_use(vendor_hbtp)
# Allow hwbinder call from hal client to server and vice-versa
-binder_call(hal_hbtp_client, hal_hbtp_server)
-binder_call(hal_hbtp_server, hal_hbtp_client)
+binder_call(vendor_hal_hbtp_client, vendor_hal_hbtp_server)
+binder_call(vendor_hal_hbtp_server, vendor_hal_hbtp_client)
# Allow hwservice related rules
-add_hwservice(hal_hbtp_server, hal_hbtp_hwservice)
-allow hal_hbtp_client hal_hbtp_hwservice:hwservice_manager find;
-hal_client_domain(hbtp, hal_allocator);
+add_hwservice(vendor_hal_hbtp_server, vendor_hal_hbtp_hwservice)
+allow vendor_hal_hbtp_client vendor_hal_hbtp_hwservice:hwservice_manager find;
+hal_client_domain(vendor_hbtp, hal_allocator);
diff --git a/generic/vendor/common/healthd.te b/generic/vendor/common/healthd.te
index 54954dd..bf85bab 100644
--- a/generic/vendor/common/healthd.te
+++ b/generic/vendor/common/healthd.te
@@ -25,11 +25,11 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
allow healthd self:capability2 wake_alarm;
-r_dir_file(healthd, sysfs_battery_supply)
-r_dir_file(healthd, sysfs_usb_supply)
+r_dir_file(healthd, vendor_sysfs_battery_supply)
+r_dir_file(healthd, vendor_sysfs_usb_supply)
r_dir_file(healthd, sysfs_thermal);
allow healthd {
- sysfs_battery_supply
- sysfs_usb_supply
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
}:file rw_file_perms;
diff --git a/generic/vendor/common/hwservice.te b/generic/vendor/common/hwservice.te
index edcc1a1..3c96a65 100644
--- a/generic/vendor/common/hwservice.te
+++ b/generic/vendor/common/hwservice.te
@@ -24,23 +24,23 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_cne_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_cacert_hwservice, hwservice_manager_type, protected_hwservice;
-type vnd_ims_radio_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_dataconnection_hwservice, hwservice_manager_type, protected_hwservice;
-type vnd_qcrilhook_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_iwlan_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_display_config_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_imsrcsd_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_imsrtp_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_imscallinfo_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_ipacm_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_hbtp_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_perf_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_tui_comm_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_qdutils_disp_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_trustedui_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_display_color_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_display_postproc_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_capabilityconfigstore_qti_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_camera_postproc_hwservice, hwservice_manager_type, protected_hwservice;
+type vendor_hal_cne_hwservice, hwservice_manager_type;
+type vendor_hal_cacert_hwservice, hwservice_manager_type;
+type vendor_vnd_ims_radio_hwservice, hwservice_manager_type;
+type vendor_hal_dataconnection_hwservice, hwservice_manager_type;
+type vendor_vnd_qcrilhook_hwservice, hwservice_manager_type;
+type vendor_hal_iwlan_hwservice, hwservice_manager_type;
+type vendor_hal_display_config_hwservice, hwservice_manager_type;
+type vendor_hal_imsrcsd_hwservice, hwservice_manager_type;
+type vendor_hal_imsrtp_hwservice, hwservice_manager_type;
+type vendor_hal_imscallinfo_hwservice, hwservice_manager_type;
+type vendor_hal_ipacm_hwservice, hwservice_manager_type;
+type vendor_hal_hbtp_hwservice, hwservice_manager_type;
+type vendor_hal_perf_hwservice, hwservice_manager_type;
+type vendor_hal_tui_comm_hwservice, hwservice_manager_type;
+type vendor_hal_qdutils_disp_hwservice, hwservice_manager_type;
+type vendor_hal_trustedui_hwservice, hwservice_manager_type;
+type vendor_hal_display_color_hwservice, hwservice_manager_type;
+type vendor_hal_display_postproc_hwservice, hwservice_manager_type;
+type vendor_hal_capabilityconfigstore_qti_hwservice, hwservice_manager_type;
+type vendor_hal_camera_postproc_hwservice, hwservice_manager_type;
diff --git a/generic/vendor/common/hwservice_contexts b/generic/vendor/common/hwservice_contexts
index 3dddd62..3090930 100644
--- a/generic/vendor/common/hwservice_contexts
+++ b/generic/vendor/common/hwservice_contexts
@@ -25,26 +25,25 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
com.qualcomm.qti.ant::IAntHci u:object_r:hal_bluetooth_hwservice:s0
-com.dsi.ant::IAnt u:object_r:hal_bluetooth_hwservice:s0
-com.qualcomm.qti.ims.radio::IImsRadio u:object_r:vnd_ims_radio_hwservice:s0
-com.qualcomm.qti.qcril.qcrilhook::IQtiOemHook u:object_r:vnd_qcrilhook_hwservice:s0
-vendor.qti.hardware.data.iwlan::IIWlan u:object_r:hal_iwlan_hwservice:s0
-com.qualcomm.qti.uceservice::IUceService u:object_r:hal_imsrcsd_hwservice:s0
-vendor.qti.ims.callinfo::IService u:object_r:hal_imscallinfo_hwservice:s0
-vendor.qti.qcril.am::IQcRilAudio u:object_r:vnd_qcrilhook_hwservice:s0
-vendor.qti.imsrtpservice::IRTPService u:object_r:hal_imsrtp_hwservice:s0
-vendor.qti.data.factory::IFactory u:object_r:hal_datafactory_hwservice:s0
-vendor.qti.hardware.data.connection::IDataConnection u:object_r:hal_dataconnection_hwservice:s0
-vendor.qti.hardware.cacert::IService u:object_r:hal_cacert_hwservice:s0
-vendor.display.config::IDisplayConfig u:object_r:hal_display_config_hwservice:s0
-vendor.display.color::IDisplayColor u:object_r:hal_display_color_hwservice:s0
-vendor.display.postproc::IDisplayPostproc u:object_r:hal_display_postproc_hwservice:s0
-vendor.qti.hardware.data.iwlan::IIWlan u:object_r:hal_iwlan_hwservice:s0
-vendor.qti.hardware.capabilityconfigstore::ICapabilityConfigStore u:object_r:hal_capabilityconfigstore_qti_hwservice:s0
-vendor.qti.hardware.improvetouch.touchcompanion::ITouchCompanion u:object_r:hal_hbtp_hwservice:s0
-vendor.qti.hardware.improvetouch.gesturemanager::IGestureManager u:object_r:hal_hbtp_hwservice:s0
-vendor.qti.hardware.improvetouch.blobmanager::IBlobManager u:object_r:hal_hbtp_hwservice:s0
-vendor.qti.hardware.perf::IPerf u:object_r:hal_perf_hwservice:s0
+com.qualcomm.qti.ims.radio::IImsRadio u:object_r:vendor_vnd_ims_radio_hwservice:s0
+com.qualcomm.qti.qcril.qcrilhook::IQtiOemHook u:object_r:vendor_vnd_qcrilhook_hwservice:s0
+vendor.qti.hardware.data.iwlan::IIWlan u:object_r:vendor_hal_iwlan_hwservice:s0
+com.qualcomm.qti.uceservice::IUceService u:object_r:vendor_hal_imsrcsd_hwservice:s0
+vendor.qti.ims.callinfo::IService u:object_r:vendor_hal_imscallinfo_hwservice:s0
+vendor.qti.qcril.am::IQcRilAudio u:object_r:vendor_vnd_qcrilhook_hwservice:s0
+vendor.qti.imsrtpservice::IRTPService u:object_r:vendor_hal_imsrtp_hwservice:s0
+vendor.qti.data.factory::IFactory u:object_r:vendor_hal_datafactory_hwservice:s0
+vendor.qti.hardware.data.connection::IDataConnection u:object_r:vendor_hal_dataconnection_hwservice:s0
+vendor.qti.hardware.cacert::IService u:object_r:vendor_hal_cacert_hwservice:s0
+vendor.display.config::IDisplayConfig u:object_r:vendor_hal_display_config_hwservice:s0
+vendor.display.color::IDisplayColor u:object_r:vendor_hal_display_color_hwservice:s0
+vendor.display.postproc::IDisplayPostproc u:object_r:vendor_hal_display_postproc_hwservice:s0
+vendor.qti.hardware.data.iwlan::IIWlan u:object_r:vendor_hal_iwlan_hwservice:s0
+vendor.qti.hardware.capabilityconfigstore::ICapabilityConfigStore u:object_r:vendor_hal_capabilityconfigstore_qti_hwservice:s0
+vendor.qti.hardware.improvetouch.touchcompanion::ITouchCompanion u:object_r:vendor_hal_hbtp_hwservice:s0
+vendor.qti.hardware.improvetouch.gesturemanager::IGestureManager u:object_r:vendor_hal_hbtp_hwservice:s0
+vendor.qti.hardware.improvetouch.blobmanager::IBlobManager u:object_r:vendor_hal_hbtp_hwservice:s0
+vendor.qti.hardware.perf::IPerf u:object_r:vendor_hal_perf_hwservice:s0
vendor.qti.hardware.radio.atcmdfwd::IAtCmdFwd u:object_r:hal_atfwd_hwservice:s0
vendor.qti.hardware.radio.qcrilhook::IQtiOemHook u:object_r:hal_telephony_hwservice:s0
vendor.qti.hardware.radio.am::IQcRilAudio u:object_r:hal_telephony_hwservice:s0
@@ -55,10 +54,10 @@
vendor.qti.hardware.radio.uim_remote_server::IUimRemoteServiceServer u:object_r:hal_telephony_hwservice:s0
vendor.qti.hardware.display.allocator::IQtiAllocator u:object_r:hal_graphics_allocator_hwservice:s0
vendor.qti.hardware.display.composer::IQtiComposer u:object_r:hal_graphics_composer_hwservice:s0
-vendor.qti.hardware.tui_comm::ITuiComm u:object_r:hal_tui_comm_hwservice:s0
-vendor.qti.hardware.qdutils_disp::IQdutilsDisp u:object_r:hal_qdutils_disp_hwservice:s0
-vendor.qti.hardware.trustedui::ITrustedUI u:object_r:hal_trustedui_hwservice:s0
-vendor.qti.hardware.trustedui::ITrustedInput u:object_r:hal_trustedui_hwservice:s0
+vendor.qti.hardware.tui_comm::ITuiComm u:object_r:vendor_hal_tui_comm_hwservice:s0
+vendor.qti.hardware.qdutils_disp::IQdutilsDisp u:object_r:vendor_hal_qdutils_disp_hwservice:s0
+vendor.qti.hardware.trustedui::ITrustedUI u:object_r:vendor_hal_trustedui_hwservice:s0
+vendor.qti.hardware.trustedui::ITrustedInput u:object_r:vendor_hal_trustedui_hwservice:s0
android.hardware.media.c2::IConfigurable u:object_r:hal_codec2_hwservice:s0
vendor.qti.hardware.display.mapper::IQtiMapper u:object_r:hal_graphics_mapper_hwservice:s0
-vendor.qti.hardware.camera.postproc::IPostProcService u:object_r:hal_camera_postproc_hwservice:s0
+vendor.qti.hardware.camera.postproc::IPostProcService u:object_r:vendor_hal_camera_postproc_hwservice:s0
diff --git a/generic/vendor/common/ims.te b/generic/vendor/common/ims.te
index d3660e8..f53633c 100644
--- a/generic/vendor/common/ims.te
+++ b/generic/vendor/common/ims.te
@@ -24,39 +24,39 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type ims, domain;
-type ims_exec, exec_type, vendor_file_type, file_type;
+type vendor_ims, domain;
+type vendor_ims_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(ims)
-net_domain(ims)
+init_daemon_domain(vendor_ims)
+net_domain(vendor_ims)
-get_prop(ims, hwservicemanager_prop)
-set_prop(ims, ims_prop)
-get_prop(ims, ims_prop)
-get_prop(ims, cnd_prop)
+get_prop(vendor_ims, hwservicemanager_prop)
+set_prop(vendor_ims, vendor_ims_prop)
+get_prop(vendor_ims, vendor_ims_prop)
+get_prop(vendor_ims, vendor_cnd_prop)
-allow ims sysfs_timestamp_switch:file r_file_perms;
-allow ims sysfs_data:file r_file_perms;
+allow vendor_ims vendor_sysfs_timestamp_switch:file r_file_perms;
+allow vendor_ims vendor_sysfs_data:file r_file_perms;
-allow ims self:capability net_bind_service;
+allow vendor_ims self:capability net_bind_service;
-allow ims ion_device:chr_file r_file_perms;
+allow vendor_ims ion_device:chr_file r_file_perms;
-unix_socket_connect(ims, cnd, cnd)
+unix_socket_connect(vendor_ims, vendor_cnd, vendor_cnd)
-allow ims self:socket create_socket_perms_no_ioctl;
-allow ims ims_socket:sock_file write;
-allow ims self:{ qipcrtr_socket } create_socket_perms_no_ioctl;
-allow ims self:{ netlink_generic_socket } create_socket_perms_no_ioctl;
-netmgr_socket(ims);
-allowxperm ims self:udp_socket ioctl RMNET_IOCTL_EXTENDED;
+allow vendor_ims self:socket create_socket_perms_no_ioctl;
+allow vendor_ims vendor_ims_socket:sock_file write;
+allow vendor_ims self:{ qipcrtr_socket } create_socket_perms_no_ioctl;
+allow vendor_ims self:{ netlink_generic_socket } create_socket_perms_no_ioctl;
+netmgr_socket(vendor_ims);
+allowxperm vendor_ims self:udp_socket ioctl RMNET_IOCTL_EXTENDED;
#diag
userdebug_or_eng(`
- diag_use(ims)
+ diag_use(vendor_ims)
')
-hwbinder_use(ims)
-allow ims hal_cne_hwservice:hwservice_manager find;
-allow ims hal_datafactory_hwservice:hwservice_manager find;
-binder_call(ims, cnd)
+hwbinder_use(vendor_ims)
+allow vendor_ims vendor_hal_cne_hwservice:hwservice_manager find;
+allow vendor_ims vendor_hal_datafactory_hwservice:hwservice_manager find;
+binder_call(vendor_ims, vendor_cnd)
diff --git a/generic/vendor/common/imshelper_app.te b/generic/vendor/common/imshelper_app.te
index d83b941..0305504 100644
--- a/generic/vendor/common/imshelper_app.te
+++ b/generic/vendor/common/imshelper_app.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type imshelper_app, domain;
-app_domain(imshelper_app);
-unix_socket_connect(imshelper_app, ims, ims)
-allow imshelper_app app_api_service:service_manager find;
+type vendor_imshelper_app, domain;
+app_domain(vendor_imshelper_app);
+unix_socket_connect(vendor_imshelper_app, vendor_ims, vendor_ims)
+allow vendor_imshelper_app app_api_service:service_manager find;
-#allow qsee_svc_app imshelper_app_data_file:dir create_dir_perms;
-#allow qsee_svc_app imshelper_app_data_file:file create_file_perms;
+#allow qsee_svc_app vendor_imshelper_app_data_file:dir create_dir_perms;
+#allow qsee_svc_app vendor_imshelper_app_data_file:file create_file_perms;
-allow imshelper_app system_app_data_file:dir { getattr search };
-allow imshelper_app radio_data_file:dir { getattr search };
+allow vendor_imshelper_app system_app_data_file:dir { getattr search };
+allow vendor_imshelper_app vendor_radio_data_file:dir { getattr search };
diff --git a/generic/vendor/common/init-qcom-crashdata-sh.te b/generic/vendor/common/init-qcom-crashdata-sh.te
index 6a969d6..f88b72d 100644
--- a/generic/vendor/common/init-qcom-crashdata-sh.te
+++ b/generic/vendor/common/init-qcom-crashdata-sh.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qcom-crashdata-sh, domain;
-type init-qcom-crashdata-sh_exec, exec_type, vendor_file_type, file_type;
+type vendor_init-qcom-crashdata-sh, domain;
+type vendor_init-qcom-crashdata-sh_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(init-qcom-crashdata-sh)
+init_daemon_domain(vendor_init-qcom-crashdata-sh)
-allow init-qcom-crashdata-sh vendor_shell_exec:file rx_file_perms;
-allow init-qcom-crashdata-sh vendor_toolbox_exec:file rx_file_perms;
+allow vendor_init-qcom-crashdata-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qcom-crashdata-sh vendor_toolbox_exec:file rx_file_perms;
-set_prop(init-qcom-crashdata-sh, crash_cnt_prop)
-set_prop(init-qcom-crashdata-sh, crash_detect_prop)
+set_prop(vendor_init-qcom-crashdata-sh, vendor_crash_cnt_prop)
+set_prop(vendor_init-qcom-crashdata-sh, vendor_crash_detect_prop)
diff --git a/generic/vendor/common/init-qcom-sensors-sh.te b/generic/vendor/common/init-qcom-sensors-sh.te
index 14136b5..281451d 100644
--- a/generic/vendor/common/init-qcom-sensors-sh.te
+++ b/generic/vendor/common/init-qcom-sensors-sh.te
@@ -25,19 +25,19 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qcom-sensors-sh, domain;
-type init-qcom-sensors-sh_exec, exec_type, vendor_file_type, file_type;
+type vendor_init-qcom-sensors-sh, domain;
+type vendor_init-qcom-sensors-sh_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(init-qcom-sensors-sh)
+init_daemon_domain(vendor_init-qcom-sensors-sh)
-allow init-qcom-sensors-sh vendor_shell_exec:file rx_file_perms;
-allow init-qcom-sensors-sh vendor_toolbox_exec:file rx_file_perms;
+allow vendor_init-qcom-sensors-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qcom-sensors-sh vendor_toolbox_exec:file rx_file_perms;
-r_dir_file(init-qcom-sensors-sh, mnt_vendor_file)
-r_dir_file(init-qcom-sensors-sh, persist_sensors_file)
+r_dir_file(vendor_init-qcom-sensors-sh, mnt_vendor_file)
+r_dir_file(vendor_init-qcom-sensors-sh, vendor_persist_sensors_file)
-allow init-qcom-sensors-sh persist_sensors_file:file setattr;
-allow init-qcom-sensors-sh persist_sensors_file:dir setattr;
-allow init-qcom-sensors-sh sensors_device:chr_file r_file_perms;
+allow vendor_init-qcom-sensors-sh vendor_persist_sensors_file:file setattr;
+allow vendor_init-qcom-sensors-sh vendor_persist_sensors_file:dir setattr;
+allow vendor_init-qcom-sensors-sh sensors_device:chr_file r_file_perms;
-set_prop(init-qcom-sensors-sh, sensors_prop)
+set_prop(vendor_init-qcom-sensors-sh, vendor_sensors_prop)
diff --git a/generic/vendor/common/init-qti-ims-sh.te b/generic/vendor/common/init-qti-ims-sh.te
index 72e461d..1c1fbda 100644
--- a/generic/vendor/common/init-qti-ims-sh.te
+++ b/generic/vendor/common/init-qti-ims-sh.te
@@ -25,16 +25,16 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qti-ims-sh, domain;
-type init-qti-ims-sh_exec, exec_type, vendor_file_type, file_type;
+type vendor_init-qti-ims-sh, domain;
+type vendor_init-qti-ims-sh_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(init-qti-ims-sh)
+init_daemon_domain(vendor_init-qti-ims-sh)
-allow init-qti-ims-sh vendor_shell_exec:file rx_file_perms;
-allow init-qti-ims-sh vendor_toolbox_exec:file rx_file_perms;
+allow vendor_init-qti-ims-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qti-ims-sh vendor_toolbox_exec:file rx_file_perms;
-set_prop(init-qti-ims-sh, ims_prop)
-get_prop(init-qti-ims-sh, ims_prop)
+set_prop(vendor_init-qti-ims-sh, vendor_ims_prop)
+get_prop(vendor_init-qti-ims-sh, vendor_ims_prop)
# for ro.build.product
-get_prop(init-qti-ims-sh, exported2_default_prop)
+get_prop(vendor_init-qti-ims-sh, exported2_default_prop)
diff --git a/generic/vendor/common/init.te b/generic/vendor/common/init.te
index 0d282fe..28c940b 100644
--- a/generic/vendor/common/init.te
+++ b/generic/vendor/common/init.te
@@ -38,7 +38,7 @@
allow init mnt_vendor_file:dir mounton;
-allow init ab_block_device:lnk_file relabelto;
+allow init vendor_ab_block_device:lnk_file relabelto;
#Allow init to mount non-hlos partitions in A/B builds
allow init { bt_firmware_file vendor_firmware_file firmware_file } :dir mounton;
@@ -56,21 +56,21 @@
#for generic block devices, but is unable to access those
#which have a custom lable added by us.
allow init {
- custom_ab_block_device
+ vendor_custom_ab_block_device
boot_block_device
- xbl_block_device
- ssd_block_device
- modem_block_device
- mdtp_device
+ vendor_xbl_block_device
+ vendor_ssd_block_device
+ vendor_modem_block_device
+ vendor_mdtp_device
}:{ blk_file lnk_file } relabelto;
#Allow /sys access to write zram disksize
allow init sysfs_zram:dir r_dir_perms;
allow init sysfs_zram:file r_file_perms;
-allow init sysfs_boot_adsp:file w_file_perms;
-# Search and write access for sysfs_graphics for backlight in recovery
+allow init vendor_sysfs_boot_adsp:file w_file_perms;
+# Search and write access for vendor_sysfs_graphics for backlight in recovery
recovery_only(`
-allow init sysfs_graphics:file w_file_perms;
-allow init sysfs_graphics:dir search;
+allow init vendor_sysfs_graphics:file w_file_perms;
+allow init vendor_sysfs_graphics:dir search;
')
diff --git a/generic/vendor/common/init_shell.te b/generic/vendor/common/init_shell.te
index d7d3471..4592728 100644
--- a/generic/vendor/common/init_shell.te
+++ b/generic/vendor/common/init_shell.te
@@ -27,38 +27,38 @@
# Restricted domain for shell processes spawned by init.
# Normally these are shell commands or scripts invoked via sh
# from an init*.rc file. No service should ever run in this domain.
-type qti_init_shell, domain;
-type qti_init_shell_exec, exec_type, vendor_file_type,file_type;
+type vendor_qti_init_shell, domain;
+type vendor_qti_init_shell_exec, exec_type, vendor_file_type,file_type;
-init_daemon_domain(qti_init_shell)
+init_daemon_domain(vendor_qti_init_shell)
-domain_auto_trans(init, vendor_shell_exec, qti_init_shell)
+domain_auto_trans(init, vendor_shell_exec, vendor_qti_init_shell)
# For executing init shell scripts (init.qcom.early_boot.sh)
-allow qti_init_shell qti_init_shell_exec:file { rx_file_perms entrypoint };
+allow vendor_qti_init_shell vendor_qti_init_shell_exec:file { rx_file_perms entrypoint };
#execute init scripts
-allow qti_init_shell vendor_shell_exec:file {rx_file_perms entrypoint };
-allow qti_init_shell vendor_toolbox_exec:file rx_file_perms;
+allow vendor_qti_init_shell vendor_shell_exec:file {rx_file_perms entrypoint };
+allow vendor_qti_init_shell vendor_toolbox_exec:file rx_file_perms;
# For getting idle_time value
# this is needed for dynamic_fps and bw_mode_bitmap
-allow qti_init_shell sysfs_graphics:file {rw_file_perms setattr};
+allow vendor_qti_init_shell vendor_sysfs_graphics:file {rw_file_perms setattr};
-allow qti_init_shell mnt_vendor_file:dir w_dir_perms;
-allow qti_init_shell mnt_vendor_file:file create_file_perms;
-allow qti_init_shell smd_device:chr_file rw_file_perms;
+allow vendor_qti_init_shell mnt_vendor_file:dir w_dir_perms;
+allow vendor_qti_init_shell mnt_vendor_file:file create_file_perms;
+allow vendor_qti_init_shell vendor_smd_device:chr_file rw_file_perms;
# Run helpers from / or /system without changing domain.
-allow qti_init_shell { rootfs vendor_shell_exec }:file execute_no_trans;
+allow vendor_qti_init_shell { rootfs vendor_shell_exec }:file execute_no_trans;
-allow qti_init_shell gpu_device:chr_file getattr;
+allow vendor_qti_init_shell gpu_device:chr_file getattr;
-allow qti_init_shell sysfs_cpu_boost:dir r_dir_perms;
-allow qti_init_shell sysfs_cpu_boost:file rw_file_perms;
+allow vendor_qti_init_shell vendor_sysfs_cpu_boost:dir r_dir_perms;
+allow vendor_qti_init_shell vendor_sysfs_cpu_boost:file rw_file_perms;
# for insmod of iris ko, this is needed.
# fowner and fsetid are needed for chmod display nodes.
-allow qti_init_shell self:capability {
+allow vendor_qti_init_shell self:capability {
sys_module
net_admin
chown
@@ -67,111 +67,111 @@
sys_admin
};
-set_prop(qti_init_shell, ctl_netmgrd_prop)
-set_prop(qti_init_shell, ctl_port-bridge_prop)
-set_prop(qti_init_shell, ctl_qcrild_prop)
-set_prop(qti_init_shell, ipacm-diag_prop)
-set_prop(qti_init_shell, ipacm_prop)
-set_prop(qti_init_shell, msm_irqbalance_prop)
-set_prop(qti_init_shell, vendor_dataqti_prop)
-set_prop(qti_init_shell, vendor_display_prop)
-set_prop(qti_init_shell, vendor_alarm_boot_prop)
-set_prop(qti_init_shell, vendor_gralloc_prop)
-set_prop(qti_init_shell, vendor_usb_prop)
-set_prop(qti_init_shell, vendor_system_prop)
-set_prop(qti_init_shell, vendor_mpctl_prop)
-set_prop(qti_init_shell, vendor_radio_prop)
-set_prop(qti_init_shell, vendor_audio_prop)
-get_prop(qti_init_shell, exported3_radio_prop)
-set_prop(qti_init_shell, vendor_gpu_prop)
-set_prop(qti_init_shell, sensors_prop)
+set_prop(vendor_qti_init_shell, vendor_ctl_netmgrd_prop)
+set_prop(vendor_qti_init_shell, vendor_ctl_port-bridge_prop)
+set_prop(vendor_qti_init_shell, vendor_ctl_qcrild_prop)
+set_prop(vendor_qti_init_shell, vendor_ipacm-diag_prop)
+set_prop(vendor_qti_init_shell, vendor_ipacm_prop)
+set_prop(vendor_qti_init_shell, vendor_msm_irqbalance_prop)
+set_prop(vendor_qti_init_shell, vendor_dataqti_prop)
+set_prop(vendor_qti_init_shell, vendor_display_prop)
+set_prop(vendor_qti_init_shell, vendor_alarm_boot_prop)
+set_prop(vendor_qti_init_shell, vendor_gralloc_prop)
+set_prop(vendor_qti_init_shell, vendor_usb_prop)
+set_prop(vendor_qti_init_shell, vendor_system_prop)
+set_prop(vendor_qti_init_shell, vendor_mpctl_prop)
+set_prop(vendor_qti_init_shell, vendor_radio_prop)
+set_prop(vendor_qti_init_shell, vendor_audio_prop)
+get_prop(vendor_qti_init_shell, exported3_radio_prop)
+set_prop(vendor_qti_init_shell, vendor_gpu_prop)
+set_prop(vendor_qti_init_shell, vendor_sensors_prop)
-allow qti_init_shell {
+allow vendor_qti_init_shell {
sysfs_devices_system_cpu
sysfs_lowmemorykiller
- sysfs_mmc_host
- sysfs_process_reclaim
+ vendor_sysfs_mmc_host
+ vendor_sysfs_process_reclaim
}:file w_file_perms;
-r_dir_file(qti_init_shell, sysfs_type)
-r_dir_file(qti_init_shell, sysfs_devfreq)
-allow qti_init_shell sysfs_devfreq:file w_file_perms;
-allow qti_init_shell sysfs_soc:file write;
-allow qti_init_shell sysfs:{ dir file lnk_file } relabelfrom;
-allow qti_init_shell sysfs_devices_system_cpu: { dir file lnk_file } relabelto;
+r_dir_file(vendor_qti_init_shell, sysfs_type)
+r_dir_file(vendor_qti_init_shell, vendor_sysfs_devfreq)
+allow vendor_qti_init_shell vendor_sysfs_devfreq:file w_file_perms;
+allow vendor_qti_init_shell vendor_sysfs_soc:file write;
+allow vendor_qti_init_shell sysfs:{ dir file lnk_file } relabelfrom;
+allow vendor_qti_init_shell sysfs_devices_system_cpu: { dir file lnk_file } relabelto;
# To start sensors for DSPS enabled platforms
-r_dir_file(qti_init_shell, mnt_vendor_file)
-r_dir_file(qti_init_shell, persist_bluetooth_file)
+r_dir_file(vendor_qti_init_shell, mnt_vendor_file)
+r_dir_file(vendor_qti_init_shell, vendor_persist_bluetooth_file)
-allow qti_init_shell { proc proc_net}:file write;
-allow qti_init_shell proc_net:file r_file_perms;
+allow vendor_qti_init_shell { proc proc_net}:file write;
+allow vendor_qti_init_shell proc_net:file r_file_perms;
-allow qti_init_shell graphics_device:dir create_dir_perms;
-allow qti_init_shell graphics_device:lnk_file create_file_perms;
+allow vendor_qti_init_shell graphics_device:dir create_dir_perms;
+allow vendor_qti_init_shell graphics_device:lnk_file create_file_perms;
#insmod of ko from scripts need kernel key search
-allow qti_init_shell kernel:key search;
+allow vendor_qti_init_shell kernel:key search;
-allow qti_init_shell cgroup:dir add_name;
+allow vendor_qti_init_shell cgroup:dir add_name;
# To allow copy for mbn files
-r_dir_file(qti_init_shell, firmware_file)
+r_dir_file(vendor_qti_init_shell, firmware_file)
# /dev/block/zram0
-allow qti_init_shell block_device:dir r_dir_perms;
-allow qti_init_shell swap_block_device:blk_file rw_file_perms;
+allow vendor_qti_init_shell block_device:dir r_dir_perms;
+allow vendor_qti_init_shell swap_block_device:blk_file rw_file_perms;
#For configfs permission
-allow qti_init_shell configfs:dir r_dir_perms;
-allow qti_init_shell configfs:file rw_file_perms;
+allow vendor_qti_init_shell configfs:dir r_dir_perms;
+allow vendor_qti_init_shell configfs:file rw_file_perms;
#Allow /sys access to write zram disksize
-allow qti_init_shell sysfs_zram:dir r_dir_perms;
-allow qti_init_shell sysfs_zram:file rw_file_perms;
+allow vendor_qti_init_shell sysfs_zram:dir r_dir_perms;
+allow vendor_qti_init_shell sysfs_zram:file rw_file_perms;
# To get GPU frequencies and set attributes
-allow qti_init_shell sysfs_kgsl:file { r_file_perms setattr };
+allow vendor_qti_init_shell vendor_sysfs_kgsl:file { r_file_perms setattr };
-allow qti_init_shell proc:file r_file_perms;
-allow qti_init_shell rootfs:file r_file_perms;
+allow vendor_qti_init_shell proc:file r_file_perms;
+allow vendor_qti_init_shell rootfs:file r_file_perms;
-allow qti_init_shell radio_vendor_data_file:dir create_dir_perms;
-allow qti_init_shell radio_vendor_data_file:file create_file_perms;
+allow vendor_qti_init_shell vendor_radio_vendor_data_file:dir create_dir_perms;
+allow vendor_qti_init_shell vendor_radio_vendor_data_file:file create_file_perms;
-allow qti_init_shell vendor_mbn_data_file:dir create_dir_perms;
-allow qti_init_shell vendor_mbn_data_file:file create_file_perms;
+allow vendor_qti_init_shell vendor_mbn_data_file:dir create_dir_perms;
+allow vendor_qti_init_shell vendor_mbn_data_file:file create_file_perms;
-set_prop(qti_init_shell, ctl_vendor_hbtp_prop)
+set_prop(vendor_qti_init_shell, vendor_ctl_vendor_hbtp_prop)
# rules for vm_bms
-allow qti_init_shell {
- sysfs_battery_supply
- sysfs_usb_supply
- sysfs_usbpd_device
+allow vendor_qti_init_shell {
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
+ vendor_sysfs_usbpd_device
}:dir r_dir_perms;
-allow qti_init_shell {
- sysfs_battery_supply
- sysfs_usb_supply
- sysfs_usbpd_device
+allow vendor_qti_init_shell {
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
+ vendor_sysfs_usbpd_device
}:file rw_file_perms;
-allow qti_init_shell sysfs_battery_supply:file setattr;
-allow qti_init_shell sysfs_usb_supply:file setattr;
-allow qti_init_shell sysfs_usbpd_device:file setattr;
+allow vendor_qti_init_shell vendor_sysfs_battery_supply:file setattr;
+allow vendor_qti_init_shell vendor_sysfs_usb_supply:file setattr;
+allow vendor_qti_init_shell vendor_sysfs_usbpd_device:file setattr;
-allow qti_init_shell sysfs_devices_system_cpu:file w_file_perms;
+allow vendor_qti_init_shell sysfs_devices_system_cpu:file w_file_perms;
-allow qti_init_shell sysfs_msm_power:file rw_file_perms;
+allow vendor_qti_init_shell vendor_sysfs_msm_power:file rw_file_perms;
-allow qti_init_shell msm_irqbalanced_exec:file getattr;
+allow vendor_qti_init_shell vendor_msm_irqbalanced_exec:file getattr;
-set_prop(qti_init_shell, vendor_alarm_boot_prop)
+set_prop(vendor_qti_init_shell, vendor_alarm_boot_prop)
-set_prop(qti_init_shell, vendor_wifi_prop)
+set_prop(vendor_qti_init_shell, vendor_wifi_prop)
# To read /proc/meminfo
-allow qti_init_shell proc_meminfo:file r_file_perms;
+allow vendor_qti_init_shell proc_meminfo:file r_file_perms;
-allow qti_init_shell sysfs_suspend:file w_file_perms;
+allow vendor_qti_init_shell vendor_sysfs_suspend:file w_file_perms;
diff --git a/generic/vendor/common/ipacm.te b/generic/vendor/common/ipacm.te
index 785da05..c09b1d6 100644
--- a/generic/vendor/common/ipacm.te
+++ b/generic/vendor/common/ipacm.te
@@ -25,29 +25,29 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# General definitions
-type ipacm, domain;
-type ipacm-diag, domain;
-type ipacm_exec, exec_type, vendor_file_type, file_type;
-type ipacm-diag_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(ipacm)
-init_daemon_domain(ipacm-diag)
+type vendor_ipacm, domain;
+type vendor_ipacm-diag, domain;
+type vendor_ipacm_exec, exec_type, vendor_file_type, file_type;
+type vendor_ipacm-diag_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_ipacm)
+init_daemon_domain(vendor_ipacm-diag)
# associate netdomain to use for accessing internet sockets
-net_domain(ipacm)
+net_domain(vendor_ipacm)
-hal_server_domain(ipacm, hal_tetheroffload)
+hal_server_domain(vendor_ipacm, hal_tetheroffload)
userdebug_or_eng(`
- # Allow using the logging file between ipacm and ipacm-diag
- unix_socket_send(ipacm, ipacm, ipacm-diag)
+ # Allow using the logging file between vendor_ipacm and vendor_ipacm-diag
+ unix_socket_send(vendor_ipacm, vendor_ipacm, vendor_ipacm-diag)
')
# Allow operations with /dev/ipa, /dev/wwan_ioctl and /dev/ipaNatTable
-allow hal_tetheroffload ipa_dev:chr_file rw_file_perms;
+allow hal_tetheroffload vendor_ipa_dev:chr_file rw_file_perms;
# Allow UDP socket create and ioctl
allow hal_tetheroffload self:udp_socket create_socket_perms;
-allowxperm ipacm self:udp_socket ioctl SIOCGIFNAME;
+allowxperm vendor_ipacm self:udp_socket ioctl SIOCGIFNAME;
# Allow receiving NETLINK messages
allow hal_tetheroffload self:netlink_route_socket { nlmsg_read create_socket_perms_no_ioctl };
@@ -61,9 +61,9 @@
} create_socket_perms_no_ioctl;
# Allow creating and modifying the PID file
-allow hal_tetheroffload ipa_vendor_data_file:dir w_dir_perms;
-allow hal_tetheroffload ipa_vendor_data_file:file create_file_perms;
+allow hal_tetheroffload vendor_ipa_vendor_data_file:dir w_dir_perms;
+allow hal_tetheroffload vendor_ipa_vendor_data_file:file create_file_perms;
-# To register ipacm to hwbinder
-#add_hwservice(ipacm, hal_ipacm_hwservice)
-#binder_call(ipacm, system_server)
+# To register vendor_ipacm to hwbinder
+#add_hwservice(vendor_ipacm, hal_vendor_ipacm_hwservice)
+#binder_call(vendor_ipacm, system_server)
diff --git a/generic/vendor/common/irsc_util.te b/generic/vendor/common/irsc_util.te
index 57936a3..afeba84 100644
--- a/generic/vendor/common/irsc_util.te
+++ b/generic/vendor/common/irsc_util.te
@@ -24,10 +24,10 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type irsc_util, domain;
-type irsc_util_exec, exec_type, vendor_file_type, file_type;
+type vendor_irsc_util, domain;
+type vendor_irsc_util_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(irsc_util)
+init_daemon_domain(vendor_irsc_util)
-allow irsc_util self:socket create_socket_perms;
-allowxperm irsc_util self:socket ioctl msm_sock_ipc_ioctls;
+allow vendor_irsc_util self:socket create_socket_perms;
+allowxperm vendor_irsc_util self:socket ioctl msm_sock_ipc_ioctls;
diff --git a/generic/vendor/common/kernel.te b/generic/vendor/common/kernel.te
index d77315f..b7ecdc0 100644
--- a/generic/vendor/common/kernel.te
+++ b/generic/vendor/common/kernel.te
@@ -28,8 +28,8 @@
userdebug_or_eng(`
allow kernel self:socket create;
allow kernel self:qipcrtr_socket create;
- allow kernel debugfs_wlan:dir search;
- allow kernel debugfs_ipc:dir search;
+ allow kernel vendor_debugfs_wlan:dir search;
+ allow kernel vendor_debugfs_ipc:dir search;
')
# Access firmware_file
diff --git a/generic/vendor/common/location.te b/generic/vendor/common/location.te
index d2ac9b8..8e143bc 100644
--- a/generic/vendor/common/location.te
+++ b/generic/vendor/common/location.te
@@ -25,75 +25,75 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# generic/location.te - sepolicy rules for generic location modules
+# generic/vendor_location.te - sepolicy rules for generic vendor_location modules
# loc_launcher service
-# which launches various other services supporting GPS & Wifi-RTT (LOWI) location
-type location, domain;
-type location_exec, exec_type, vendor_file_type, file_type;
+# which launches various other services supporting GPS & Wifi-RTT (LOWI) vendor_location
+type vendor_location, domain;
+type vendor_location_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(location)
+init_daemon_domain(vendor_location)
-allow location self:capability { setgid setuid };
+allow vendor_location self:capability { setgid setuid };
-hwbinder_use(location)
+hwbinder_use(vendor_location)
-get_prop(location, hwservicemanager_prop)
-get_prop(location, cnd_prop)
+get_prop(vendor_location, hwservicemanager_prop)
+get_prop(vendor_location, vendor_cnd_prop)
#xtra-daemon access to qdma properties
-get_prop(location, vendor_qdma_prop)
+get_prop(vendor_location, vendor_qdma_prop)
-allow location fwk_sensor_hwservice:hwservice_manager find;
-binder_call(location, system_server)
-binder_call(location, cnd)
+allow vendor_location fwk_sensor_hwservice:hwservice_manager find;
+binder_call(vendor_location, system_server)
+binder_call(vendor_location, vendor_cnd)
# Enable standard network access (for XTRA download)
-net_domain(location)
+net_domain(vendor_location)
# required for xtra-daemon, slim-daemon.
-allow location self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow vendor_location self:qipcrtr_socket create_socket_perms_no_ioctl;
-dontaudit location kernel:system module_request;
+dontaudit vendor_location kernel:system module_request;
-# execute permission for location daemons in /vendor/bin/
-allow location location_exec:file rx_file_perms;
+# execute permission for vendor_location daemons in /vendor/bin/
+allow vendor_location vendor_location_exec:file rx_file_perms;
-# /data/vendor/location
-allow location location_data_file:dir create_dir_perms;
-allow location location_data_file:file create_file_perms;
+# /data/vendor/vendor_location
+allow vendor_location vendor_location_data_file:dir create_dir_perms;
+allow vendor_location vendor_location_data_file:file create_file_perms;
-# /dev/socket/location
-allow location location_socket:sock_file create_file_perms;
-allow location location_socket:dir rw_dir_perms;
+# /dev/socket/vendor_location
+allow vendor_location vendor_location_socket:sock_file create_file_perms;
+allow vendor_location vendor_location_socket:dir rw_dir_perms;
-allow location hal_gnss_qti:unix_dgram_socket sendto;
+allow vendor_location vendor_hal_gnss_qti:unix_dgram_socket sendto;
-# permission for read execute location daemons in userdebug mode.
+# permission for read execute vendor_location daemons in userdebug mode.
userdebug_or_eng(`
- allow shell location_exec:file rx_file_perms;
+ allow shell vendor_location_exec:file rx_file_perms;
')
## lowi-server
##############
# some additional network access
-allow location self:netlink_generic_socket create_socket_perms_no_ioctl;
-allow location self:netlink_socket create_socket_perms_no_ioctl;
-allowxperm location self:udp_socket ioctl lowi_server_ioctls;
-allow location hal_wifi:unix_stream_socket { read write };
+allow vendor_location self:netlink_generic_socket create_socket_perms_no_ioctl;
+allow vendor_location self:netlink_socket create_socket_perms_no_ioctl;
+allowxperm vendor_location self:udp_socket ioctl lowi_server_ioctls;
+allow vendor_location hal_wifi:unix_stream_socket { read write };
# /data/vendor/wifi
-allow location wifi_vendor_data_file:dir search;
+allow vendor_location vendor_wifi_vendor_data_file:dir search;
# /data/vendor/wifi/wpa
-allow location wpa_data_file:dir rw_dir_perms;
-allow location wpa_data_file:sock_file create_file_perms;
-allow location hal_wifi_supplicant_default:unix_dgram_socket sendto;
+allow vendor_location wpa_data_file:dir rw_dir_perms;
+allow vendor_location wpa_data_file:sock_file create_file_perms;
+allow vendor_location hal_wifi_supplicant_default:unix_dgram_socket sendto;
# /dev/socket/wifihal
-allow location wifihal_socket:dir search;
-unix_socket_send(location, wifihal, hal_wifi_default);
+allow vendor_location vendor_wifihal_socket:dir search;
+unix_socket_send(vendor_location, vendor_wifihal, hal_wifi_default);
## xtra-daemon
##############
-allow location {hal_cacert_hwservice hal_datafactory_hwservice hal_cne_hwservice}:hwservice_manager find;
-binder_call(location, qtidataservices_app)
+allow vendor_location {vendor_hal_cacert_hwservice vendor_hal_datafactory_hwservice vendor_hal_cne_hwservice}:hwservice_manager find;
+binder_call(vendor_location, vendor_qtidataservices_app)
diff --git a/generic/vendor/common/mediacodec.te b/generic/vendor/common/mediacodec.te
index fd8ee3e..3de932d 100644
--- a/generic/vendor/common/mediacodec.te
+++ b/generic/vendor/common/mediacodec.te
@@ -34,6 +34,6 @@
allow mediacodec vendor_media_data_file:file create_file_perms;
#Allow mediacodec to access configstore
-hal_client_domain(mediacodec, hal_capabilityconfigstore_qti)
+hal_client_domain(mediacodec, vendor_hal_capabilityconfigstore_qti)
#allow mediacodec to read adsprpc_prop
get_prop(mediacodec, vendor_adsprpc_prop)
diff --git a/generic/vendor/common/msm_irqbalanced.te b/generic/vendor/common/msm_irqbalanced.te
index 3c0c011..b97e091 100644
--- a/generic/vendor/common/msm_irqbalanced.te
+++ b/generic/vendor/common/msm_irqbalanced.te
@@ -24,17 +24,17 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type msm_irqbalanced, domain;
-type msm_irqbalanced_exec, exec_type, vendor_file_type, file_type;
+type vendor_msm_irqbalanced, domain;
+type vendor_msm_irqbalanced_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(msm_irqbalanced)
+init_daemon_domain(vendor_msm_irqbalanced)
-allow msm_irqbalanced cgroup:dir { create add_name };
-allow msm_irqbalanced { proc sysfs_devices_system_cpu }:file w_file_perms;
+allow vendor_msm_irqbalanced cgroup:dir { create add_name };
+allow vendor_msm_irqbalanced { proc sysfs_devices_system_cpu }:file w_file_perms;
# access smp_affinity
-allow msm_irqbalanced proc:file r_file_perms;
-allow msm_irqbalanced proc_interrupts:file r_file_perms;
-allow msm_irqbalanced proc_stat:file r_file_perms;
+allow vendor_msm_irqbalanced proc:file r_file_perms;
+allow vendor_msm_irqbalanced proc_interrupts:file r_file_perms;
+allow vendor_msm_irqbalanced proc_stat:file r_file_perms;
# irq_blacklist_on
-allow msm_irqbalanced sysfs_irqbalance:file r_file_perms;
+allow vendor_msm_irqbalanced vendor_sysfs_irqbalance:file r_file_perms;
diff --git a/generic/vendor/common/netmgrd.te b/generic/vendor/common/netmgrd.te
index 9326661..03074ea 100644
--- a/generic/vendor/common/netmgrd.te
+++ b/generic/vendor/common/netmgrd.te
@@ -24,58 +24,56 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type netmgrd, domain;
-type netmgrd_exec, exec_type, vendor_file_type, file_type;
+type vendor_netmgrd, domain;
+type vendor_netmgrd_exec, exec_type, vendor_file_type, file_type;
-net_domain(netmgrd)
-init_daemon_domain(netmgrd)
+net_domain(vendor_netmgrd)
+init_daemon_domain(vendor_netmgrd)
-allow netmgrd netmgrd_socket:dir w_dir_perms;
-allow netmgrd netmgrd_socket:sock_file create_file_perms;
-allow netmgrd self:netlink_xfrm_socket { create_socket_perms_no_ioctl nlmsg_write };
-allow netmgrd self:netlink_generic_socket create_socket_perms_no_ioctl;
-allow netmgrd self:netlink_route_socket nlmsg_write;
-allow netmgrd self:netlink_socket create_socket_perms_no_ioctl;
-allow netmgrd self:socket create_socket_perms;
-allow netmgrd self:tipc_socket { create_socket_perms_no_ioctl };
+allow vendor_netmgrd vendor_netmgrd_socket:dir w_dir_perms;
+allow vendor_netmgrd vendor_netmgrd_socket:sock_file create_file_perms;
+allow vendor_netmgrd self:netlink_xfrm_socket { create_socket_perms_no_ioctl nlmsg_write };
+allow vendor_netmgrd self:netlink_generic_socket create_socket_perms_no_ioctl;
+allow vendor_netmgrd self:netlink_route_socket nlmsg_write;
+allow vendor_netmgrd self:netlink_socket create_socket_perms_no_ioctl;
+allow vendor_netmgrd self:socket create_socket_perms;
+allowxperm vendor_netmgrd self:socket ioctl msm_sock_ipc_ioctls;
+allowxperm vendor_netmgrd self:udp_socket ioctl priv_sock_ioctls;
-allowxperm netmgrd self:socket ioctl msm_sock_ipc_ioctls;
-allowxperm netmgrd self:udp_socket ioctl priv_sock_ioctls;
+allow vendor_netmgrd sysfs_net:dir r_dir_perms;
+allow vendor_netmgrd sysfs_net:file rw_file_perms;
+allow vendor_netmgrd vendor_sysfs_data:file r_file_perms;
-allow netmgrd sysfs_net:dir r_dir_perms;
-allow netmgrd sysfs_net:file rw_file_perms;
-allow netmgrd sysfs_data:file r_file_perms;
-
-wakelock_use(netmgrd)
+wakelock_use(vendor_netmgrd)
#Allow netutils usage
-domain_auto_trans(netmgrd, netutils_wrapper_exec, netutils_wrapper)
+domain_auto_trans(vendor_netmgrd, netutils_wrapper_exec, netutils_wrapper)
-use_netutils(netmgrd)
+use_netutils(vendor_netmgrd)
#Allow diag logging
-allow netmgrd sysfs_timestamp_switch:file { read open };
+allow vendor_netmgrd vendor_sysfs_timestamp_switch:file { read open };
userdebug_or_eng(`
- r_dir_file(netmgrd, sysfs_diag)
+ r_dir_file(vendor_netmgrd, vendor_sysfs_diag)
')
#Ignore if device loading for private IOCTL failed
-dontaudit netmgrd kernel:system { module_request };
+dontaudit vendor_netmgrd kernel:system { module_request };
-allow netmgrd proc_net:file rw_file_perms;
-allow netmgrd netmgr_data_file:dir rw_dir_perms;
-allow netmgrd netmgr_data_file:file create_file_perms;
-allow netmgrd netmgr_recovery_data_file:file create_file_perms;
-allow netmgrd netmgr_recovery_data_file:dir rw_dir_perms;
+allow vendor_netmgrd proc_net:file rw_file_perms;
+allow vendor_netmgrd vendor_netmgr_data_file:dir rw_dir_perms;
+allow vendor_netmgrd vendor_netmgr_data_file:file create_file_perms;
+allow vendor_netmgrd vendor_netmgr_recovery_data_file:file create_file_perms;
+allow vendor_netmgrd vendor_netmgr_recovery_data_file:dir rw_dir_perms;
-get_prop(netmgrd, hwservicemanager_prop)
-hwbinder_use(netmgrd)
-binder_call(netmgrd, netd)
-allow netmgrd system_net_netd_hwservice:hwservice_manager find;
+get_prop(vendor_netmgrd, hwservicemanager_prop)
+hwbinder_use(vendor_netmgrd)
+binder_call(vendor_netmgrd, netd)
+allow vendor_netmgrd system_net_netd_hwservice:hwservice_manager find;
-allow netmgrd self:capability { net_admin net_raw setgid setpcap setuid };
+allow vendor_netmgrd self:capability { net_admin net_raw setgid setpcap setuid };
-allow netmgrd vendor_toolbox_exec:file rx_file_perms;
+allow vendor_netmgrd vendor_toolbox_exec:file rx_file_perms;
-dontaudit netmgrd kernel:system module_request;
-dontaudit netmgrd self:system module_request;
+dontaudit vendor_netmgrd kernel:system module_request;
+dontaudit vendor_netmgrd self:system module_request;
diff --git a/generic/vendor/common/pd_services.te b/generic/vendor/common/pd_services.te
index 5461588..e6361b4 100644
--- a/generic/vendor/common/pd_services.te
+++ b/generic/vendor/common/pd_services.te
@@ -37,5 +37,5 @@
allow vendor_pd_mapper self:socket create_socket_perms;
allowxperm vendor_pd_mapper self:socket ioctl IPC_ROUTER_IOCTL_BIND_CONTROL_PORT;
-allow vendor_pd_mapper sysfs_data:file r_file_perms;
+allow vendor_pd_mapper vendor_sysfs_data:file r_file_perms;
get_prop(vendor_pd_mapper, vendor_pd_locater_dbg_prop)
diff --git a/generic/vendor/common/peripheral_manager.te b/generic/vendor/common/peripheral_manager.te
index 85c66f1..08a8baf 100644
--- a/generic/vendor/common/peripheral_manager.te
+++ b/generic/vendor/common/peripheral_manager.te
@@ -35,7 +35,7 @@
vndbinder_use(vendor_per_mgr)
binder_call(vendor_per_mgr, hal_gnss)
binder_call(vendor_per_mgr, vendor_per_proxy)
-binder_call(vendor_per_mgr, wcnss_service)
+binder_call(vendor_per_mgr, vendor_wcnss_service)
binder_call(vendor_per_mgr, rild)
allow vendor_per_mgr self:capability net_bind_service;
@@ -45,10 +45,10 @@
allow vendor_per_mgr self:socket create_socket_perms;
allowxperm vendor_per_mgr self:socket ioctl msm_sock_ipc_ioctls;
-allow vendor_per_mgr ssr_device:chr_file { open read };
+allow vendor_per_mgr vendor_ssr_device:chr_file { open read };
# Needed by libmdmdetect to get subsystem info and to check their states
-allow vendor_per_mgr sysfs_data:file r_file_perms;
+allow vendor_per_mgr vendor_sysfs_data:file r_file_perms;
# Set the peripheral state property
set_prop(vendor_per_mgr, vendor_per_mgr_state_prop);
diff --git a/generic/vendor/common/port-bridge.te b/generic/vendor/common/port-bridge.te
index 6c95a1b..af31cc0 100644
--- a/generic/vendor/common/port-bridge.te
+++ b/generic/vendor/common/port-bridge.te
@@ -24,31 +24,31 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type port-bridge, domain;
-type port-bridge_exec, exec_type, vendor_file_type, file_type;
+type vendor_port-bridge, domain;
+type vendor_port-bridge_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(port-bridge)
+init_daemon_domain(vendor_port-bridge)
userdebug_or_eng(`
- domain_auto_trans(shell, port-bridge_exec, netmgrd)
- #domain_auto_trans(adbd, port-bridge_exec, netmgrd)
- diag_use(port-bridge)
+ domain_auto_trans(shell, vendor_port-bridge_exec, vendor_netmgrd)
+ #domain_auto_trans(adbd, vendor_port-bridge_exec, netmgrd)
+ diag_use(vendor_port-bridge)
')
# Allow operations on different types of sockets
-allow port-bridge port-bridge:netlink_kobject_uevent_socket { create bind read };
+allow vendor_port-bridge vendor_port-bridge:netlink_kobject_uevent_socket { create bind read };
-allow port-bridge {
+allow vendor_port-bridge {
# Allow operations on mhi transport
- mhi_device
+ vendor_mhi_device
# Allow operations on ATCoP g-link transport
- at_device
+ vendor_at_device
}:chr_file rw_file_perms;
#access ipa sysfs node
-allow port-bridge sysfs_data:file r_file_perms;
+allow vendor_port-bridge vendor_sysfs_data:file r_file_perms;
-allow port-bridge port_bridge_data_file:file create_file_perms;
-allow port-bridge port_bridge_data_file:dir w_dir_perms;
-allow port-bridge port-bridge_socket:dir w_dir_perms;
-allow port-bridge port-bridge_socket:sock_file create_file_perms;
+allow vendor_port-bridge vendor_port_bridge_data_file:file create_file_perms;
+allow vendor_port-bridge vendor_port_bridge_data_file:dir w_dir_perms;
+allow vendor_port-bridge vendor_port-bridge_socket:dir w_dir_perms;
+allow vendor_port-bridge vendor_port-bridge_socket:sock_file create_file_perms;
diff --git a/generic/vendor/common/power_off_alarm.te b/generic/vendor/common/power_off_alarm.te
index db4c23d..35f6891 100755
--- a/generic/vendor/common/power_off_alarm.te
+++ b/generic/vendor/common/power_off_alarm.te
@@ -25,14 +25,14 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type power_off_alarm, domain;
-type power_off_alarm_exec, exec_type, vendor_file_type, file_type;
+type vendor_power_off_alarm, domain;
+type vendor_power_off_alarm_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(power_off_alarm)
+init_daemon_domain(vendor_power_off_alarm)
-allow power_off_alarm rtc_device:chr_file r_file_perms;
-allow power_off_alarm kmsg_device:chr_file w_file_perms;
+allow vendor_power_off_alarm rtc_device:chr_file r_file_perms;
+allow vendor_power_off_alarm kmsg_device:chr_file w_file_perms;
-allow power_off_alarm self:capability2 wake_alarm;
+allow vendor_power_off_alarm self:capability2 wake_alarm;
-set_prop(power_off_alarm, powerctl_prop)
+set_prop(vendor_power_off_alarm, powerctl_prop)
diff --git a/generic/vendor/common/poweroffalarm_app.te b/generic/vendor/common/poweroffalarm_app.te
index 5f06ae3..5aa46c2 100755
--- a/generic/vendor/common/poweroffalarm_app.te
+++ b/generic/vendor/common/poweroffalarm_app.te
@@ -25,27 +25,27 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type poweroffalarm_app, domain;
-app_domain(poweroffalarm_app);
+type vendor_poweroffalarm_app, domain;
+app_domain(vendor_poweroffalarm_app);
-allow poweroffalarm_app app_api_service:service_manager find;
+allow vendor_poweroffalarm_app app_api_service:service_manager find;
-allow poweroffalarm_app mnt_vendor_file:dir r_dir_perms;
-allow poweroffalarm_app persist_alarm_file:dir rw_dir_perms;
-allow poweroffalarm_app persist_alarm_file:file create_file_perms;
+allow vendor_poweroffalarm_app mnt_vendor_file:dir r_dir_perms;
+allow vendor_poweroffalarm_app vendor_persist_alarm_file:dir rw_dir_perms;
+allow vendor_poweroffalarm_app vendor_persist_alarm_file:file create_file_perms;
-hal_client_domain(poweroffalarm_app, hal_alarm_qti);
-hal_client_domain(poweroffalarm_app, hal_perf);
+hal_client_domain(vendor_poweroffalarm_app, vendor_hal_alarm_qti);
+hal_client_domain(vendor_poweroffalarm_app, vendor_hal_perf);
-binder_call(poweroffalarm_app, hal_alarm_qti_default);
+binder_call(vendor_poweroffalarm_app, vendor_hal_alarm_qti_default);
-allow poweroffalarm_app system_app_data_file:dir create_dir_perms;
-allow poweroffalarm_app system_app_data_file:{ file lnk_file } create_file_perms;
+allow vendor_poweroffalarm_app system_app_data_file:dir create_dir_perms;
+allow vendor_poweroffalarm_app system_app_data_file:{ file lnk_file } create_file_perms;
-allow poweroffalarm_app surfaceflinger_service:service_manager find;
-allow poweroffalarm_app audioserver_service:service_manager find;
-allow poweroffalarm_app mediaserver_service:service_manager find;
+allow vendor_poweroffalarm_app surfaceflinger_service:service_manager find;
+allow vendor_poweroffalarm_app audioserver_service:service_manager find;
+allow vendor_poweroffalarm_app mediaserver_service:service_manager find;
-get_prop(poweroffalarm_app, vendor_alarm_boot_prop);
+get_prop(vendor_poweroffalarm_app, vendor_alarm_boot_prop);
-#get_prop(poweroffalarm_app, vendor_iop_prop)
+#get_prop(vendor_poweroffalarm_app, vendor_iop_prop)
diff --git a/generic/vendor/common/priv_app.te b/generic/vendor/common/priv_app.te
index dd2137f..1c0b1ff 100644
--- a/generic/vendor/common/priv_app.te
+++ b/generic/vendor/common/priv_app.te
@@ -25,7 +25,7 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(priv_app, hal_perf)
+hal_client_domain(priv_app, vendor_hal_perf)
# TODO(b/123050471): this grants renderscript exec permissions to the
# priv_app domain
diff --git a/generic/vendor/common/property.te b/generic/vendor/common/property.te
index 488db79..a2766fd 100644
--- a/generic/vendor/common/property.te
+++ b/generic/vendor/common/property.te
@@ -24,23 +24,23 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type ctl_netmgrd_prop, property_type;
-type ctl_port-bridge_prop, property_type;
-type ctl_qcrild_prop, property_type;
+type vendor_ctl_netmgrd_prop, property_type;
+type vendor_ctl_port-bridge_prop, property_type;
+type vendor_ctl_qcrild_prop, property_type;
type vendor_camera_prop, property_type;
-type cnd_prop, property_type;
-type crash_cnt_prop, property_type;
-type crash_detect_prop, property_type;
-type ims_prop, property_type;
-type ipacm_prop, property_type;
-type ipacm-diag_prop, property_type;
+type vendor_cnd_prop, property_type;
+type vendor_crash_cnt_prop, property_type;
+type vendor_crash_detect_prop, property_type;
+type vendor_ims_prop, property_type;
+type vendor_ipacm_prop, property_type;
+type vendor_ipacm-diag_prop, property_type;
type vendor_modem_diag_prop, property_type;
-type msm_irqbalance_prop, property_type;
+type vendor_msm_irqbalance_prop, property_type;
type vendor_per_mgr_state_prop, property_type;
type vendor_dataqti_prop, property_type;
type vendor_dataqdp_prop, property_type;
type vendor_ramdump_prop, property_type;
-type sensors_prop, property_type;
+type vendor_sensors_prop, property_type;
type vendor_tee_listener_prop, property_type;
type vendor_display_prop, property_type;
type vendor_usb_prop, property_type;
@@ -52,10 +52,10 @@
type vendor_system_prop, property_type;
#imsrcsservice
-type ctl_vendor_imsrcsservice_prop, property_type;
+type vendor_ctl_vendor_imsrcsservice_prop, property_type;
# HBTP
-type ctl_vendor_hbtp_prop, property_type;
+type vendor_ctl_vendor_hbtp_prop, property_type;
# Bluetooth props
type vendor_bluetooth_prop, property_type;
@@ -76,11 +76,11 @@
type vendor_cap_configstore_dbg_prop, property_type;
#rmt_storage
-type ctl_vendor_rmt_storage_prop, property_type;
+type vendor_ctl_vendor_rmt_storage_prop, property_type;
type vendor_gpu_prop, property_type;
-type public_vendor_default_prop, property_type;
+type vendor_public_vendor_default_prop, property_type;
# alarm property
type vendor_alarm_boot_prop, property_type;
diff --git a/generic/vendor/common/property_contexts b/generic/vendor/common/property_contexts
index 00dea85..ec55387 100644
--- a/generic/vendor/common/property_contexts
+++ b/generic/vendor/common/property_contexts
@@ -31,16 +31,16 @@
persist.vendor.qcom.bluetooth. u:object_r:vendor_bluetooth_prop:s0
vendor.qcom.bluetooth. u:object_r:vendor_bluetooth_prop:s0
vendor.wc_transport. u:object_r:vendor_bluetooth_prop:s0
-ctl.vendor.msm_irqbalance u:object_r:msm_irqbalance_prop:s0
-ctl.vendor.netmgrd u:object_r:ctl_netmgrd_prop:s0
-ctl.vendor.port-bridge u:object_r:ctl_port-bridge_prop:s0
-ctl.vendor.qcrild u:object_r:ctl_qcrild_prop:s0
-ctl.vendor.ipacm u:object_r:ipacm_prop:s0
-ctl.vendor.ipacm-diag u:object_r:ipacm-diag_prop:s0
+ctl.vendor.msm_irqbalance u:object_r:vendor_msm_irqbalance_prop:s0
+ctl.vendor.netmgrd u:object_r:vendor_ctl_netmgrd_prop:s0
+ctl.vendor.port-bridge u:object_r:vendor_ctl_port-bridge_prop:s0
+ctl.vendor.qcrild u:object_r:vendor_ctl_qcrild_prop:s0
+ctl.vendor.ipacm u:object_r:vendor_ipacm_prop:s0
+ctl.vendor.ipacm-diag u:object_r:vendor_ipacm-diag_prop:s0
ctl.vendor.dataqti u:object_r:vendor_dataqti_prop:s0
-ctl.vendor.sensors u:object_r:sensors_prop:s0
-persist.vendor.sensors. u:object_r:sensors_prop:s0
-ro.vendor.sensors. u:object_r:sensors_prop:s0
+ctl.vendor.sensors u:object_r:vendor_sensors_prop:s0
+persist.vendor.sensors. u:object_r:vendor_sensors_prop:s0
+ro.vendor.sensors. u:object_r:vendor_sensors_prop:s0
vendor.audio. u:object_r:vendor_audio_prop:s0
vendor.voice. u:object_r:vendor_audio_prop:s0
persist.vendor.audio. u:object_r:vendor_audio_prop:s0
@@ -51,12 +51,12 @@
persist.vendor.camera. u:object_r:vendor_camera_prop:s0
persist.vendor.sys.crash_rcu u:object_r:vendor_ramdump_prop:s0
persist.vendor.sys.modem.diag. u:object_r:vendor_modem_diag_prop:s0
-persist.vendor.sys.cnd u:object_r:cnd_prop:s0
-persist.vendor.cne.feature u:object_r:cnd_prop:s0
-persist.vendor.cnd.wqe u:object_r:cnd_prop:s0
-persist.vendor.cne.logging.qxdm u:object_r:cnd_prop:s0
-persist.vendor.crash.cnt u:object_r:crash_cnt_prop:s0
-persist.vendor.crash.detect u:object_r:crash_detect_prop:s0
+persist.vendor.sys.cnd u:object_r:vendor_cnd_prop:s0
+persist.vendor.cne.feature u:object_r:vendor_cnd_prop:s0
+persist.vendor.cnd.wqe u:object_r:vendor_cnd_prop:s0
+persist.vendor.cne.logging.qxdm u:object_r:vendor_cnd_prop:s0
+persist.vendor.crash.cnt u:object_r:vendor_crash_cnt_prop:s0
+persist.vendor.crash.detect u:object_r:vendor_crash_detect_prop:s0
persist.vendor.data.dont_use_epc u:object_r:vendor_dataqdp_prop:s0
persist.vendor.data.dont_use_npflag u:object_r:vendor_dataqdp_prop:s0
persist.vendor.data.profile_update u:object_r:vendor_dataqdp_prop:s0
@@ -72,14 +72,14 @@
persist.vendor.display. u:object_r:vendor_display_prop:s0
vendor.gralloc. u:object_r:vendor_gralloc_prop:s0
vendor.peripheral. u:object_r:vendor_per_mgr_state_prop:s0
-vendor.ims. u:object_r:ims_prop:s0
-ro.vendor.build.software.version u:object_r:ims_prop:s0
-persist.vendor.ims. u:object_r:ims_prop:s0
-persist.vendor.qti.telephony.vt_cam_interface u:object_r:ims_prop:s0
-ctl.vendor.imsrcsservice u:object_r:ctl_vendor_imsrcsservice_prop:s0
+vendor.ims. u:object_r:vendor_ims_prop:s0
+ro.vendor.build.software.version u:object_r:vendor_ims_prop:s0
+persist.vendor.ims. u:object_r:vendor_ims_prop:s0
+persist.vendor.qti.telephony.vt_cam_interface u:object_r:vendor_ims_prop:s0
+ctl.vendor.imsrcsservice u:object_r:vendor_ctl_vendor_imsrcsservice_prop:s0
# HBTP
-ctl.vendor.hbtp u:object_r:ctl_vendor_hbtp_prop:s0
+ctl.vendor.hbtp u:object_r:vendor_ctl_vendor_hbtp_prop:s0
#time service
persist.vendor.delta_time.enable u:object_r:vendor_time_service_prop:s0
@@ -103,17 +103,17 @@
persist.vendor.cap_configstore_debug u:object_r:vendor_cap_configstore_dbg_prop:s0
#rmt_storage
-ctl.vendor.rmt_storage u:object_r:ctl_vendor_rmt_storage_prop:s0
+ctl.vendor.rmt_storage u:object_r:vendor_ctl_vendor_rmt_storage_prop:s0
#GPU Available frequencies
vendor.gpu.available_frequencies u:object_r:vendor_gpu_prop:s0
-# public_vendor_default_prop
-ro.vendor.graphics.memory u:object_r:public_vendor_default_prop:s0
-vendor.debug.egl.changepixelformat u:object_r:public_vendor_default_prop:s0
-vendor.debug.prerotation.disable u:object_r:public_vendor_default_prop:s0
-vendor.debug.egl.swapinterval u:object_r:public_vendor_default_prop:s0
-vendor.debug.egl.profiler u:object_r:public_vendor_default_prop:s0
+# vendor_public_vendor_default_prop
+ro.vendor.graphics.memory u:object_r:vendor_public_vendor_default_prop:s0
+vendor.debug.egl.changepixelformat u:object_r:vendor_public_vendor_default_prop:s0
+vendor.debug.prerotation.disable u:object_r:vendor_public_vendor_default_prop:s0
+vendor.debug.egl.swapinterval u:object_r:vendor_public_vendor_default_prop:s0
+vendor.debug.egl.profiler u:object_r:vendor_public_vendor_default_prop:s0
#vendor-wlan
vendor.wlan. u:object_r:vendor_wifi_prop:s0
diff --git a/generic/vendor/common/qdcm-ss.te b/generic/vendor/common/qdcm-ss.te
index 6eab957..c8a8e7d 100644
--- a/generic/vendor/common/qdcm-ss.te
+++ b/generic/vendor/common/qdcm-ss.te
@@ -25,15 +25,15 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qdcm-ss, domain;
-type qdcm-ss_exec, exec_type, vendor_file_type, file_type;
+type vendor_qdcm-ss, domain;
+type vendor_qdcm-ss_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(qdcm-ss)
+init_daemon_domain(vendor_qdcm-ss)
# Rule for IPC communication
-allow qdcm-ss qdisplay_service:service_manager find;
-vndbinder_use(qdcm-ss)
-hal_client_domain(qdcm-ss, hal_graphics_composer)
+allow vendor_qdcm-ss vendor_qdisplay_service:service_manager find;
+vndbinder_use(vendor_qdcm-ss)
+hal_client_domain(vendor_qdcm-ss, hal_graphics_composer)
# Allow adbd to connect to qdcm
-unix_socket_connect(adbd, qdcmsocket, qdcm-ss);
+unix_socket_connect(adbd, vendor_qdcmsocket, vendor_qdcm-ss);
diff --git a/generic/vendor/common/qlogd.te b/generic/vendor/common/qlogd.te
index 7e1b15e..b63b600 100644
--- a/generic/vendor/common/qlogd.te
+++ b/generic/vendor/common/qlogd.te
@@ -24,18 +24,18 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qlogd, domain;
-type qlogd_exec, exec_type, vendor_file_type, file_type;
+type vendor_qlogd, domain;
+type vendor_qlogd_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
# make transition from init to its domain
- init_daemon_domain(qlogd)
+ init_daemon_domain(vendor_qlogd)
- allow qlogd diag_device:chr_file rw_file_perms;
- allow qlogd qlogd_exec:file rx_file_perms;
+ allow vendor_qlogd vendor_diag_device:chr_file rw_file_perms;
+ allow vendor_qlogd vendor_qlogd_exec:file rx_file_perms;
- allow qlogd radio_vendor_data_file:file create_file_perms;
- allow qlogd radio_vendor_data_file:dir create_dir_perms;
+ allow vendor_qlogd vendor_radio_vendor_data_file:file create_file_perms;
+ allow vendor_qlogd vendor_radio_vendor_data_file:dir create_dir_perms;
- set_prop(qlogd, vendor_modem_diag_prop)
+ set_prop(vendor_qlogd, vendor_modem_diag_prop)
')
diff --git a/generic/vendor/common/qti.te b/generic/vendor/common/qti.te
index a3349af..fa5e42f 100644
--- a/generic/vendor/common/qti.te
+++ b/generic/vendor/common/qti.te
@@ -24,27 +24,27 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qti, domain;
-type qti_exec, exec_type, vendor_file_type, file_type;
+type vendor_qti, domain;
+type vendor_qti_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(qti)
-net_domain(qti)
+init_daemon_domain(vendor_qti)
+net_domain(vendor_qti)
-allow qti self:{ qipcrtr_socket } create_socket_perms_no_ioctl;
-allow qti vendor_qti_data_file:dir r_dir_perms;
+allow vendor_qti self:{ qipcrtr_socket } create_socket_perms_no_ioctl;
+allow vendor_qti vendor_qti_data_file:dir r_dir_perms;
-allow qti smd_device:chr_file rw_file_perms;
-allow qti rmnet_device:chr_file rw_file_perms;
+allow vendor_qti vendor_smd_device:chr_file rw_file_perms;
+allow vendor_qti vendor_rmnet_device:chr_file rw_file_perms;
-allow qti { vendor_shell_exec }:file rx_file_perms;
+allow vendor_qti { vendor_shell_exec }:file rx_file_perms;
#diag
userdebug_or_eng(`
- diag_use(qti)
- allow qti { sysfs_data sysfs_timestamp_switch} :file r_file_perms;
+ diag_use(vendor_qti)
+ allow vendor_qti { vendor_sysfs_data vendor_sysfs_timestamp_switch} :file r_file_perms;
')
-allow qti mhi_device:chr_file rw_file_perms;
-allow qti sysfs_mhi:dir r_dir_perms;
+allow vendor_qti vendor_mhi_device:chr_file rw_file_perms;
+allow vendor_qti vendor_sysfs_mhi:dir r_dir_perms;
-#Allow qti to create qti socket
-allow qti dataqti_socket:sock_file rw_file_perms;
+#Allow vendor_qti to create vendor_qti socket
+allow vendor_qti vendor_dataqti_socket:sock_file rw_file_perms;
diff --git a/generic/vendor/common/qtidataservices_app.te b/generic/vendor/common/qtidataservices_app.te
index 5599294..a273713 100644
--- a/generic/vendor/common/qtidataservices_app.te
+++ b/generic/vendor/common/qtidataservices_app.te
@@ -25,27 +25,27 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qtidataservices_app, domain;
-app_domain(qtidataservices_app);
+type vendor_qtidataservices_app, domain;
+app_domain(vendor_qtidataservices_app);
-add_hwservice(qtidataservices_app, hal_cacert_hwservice)
-hwbinder_use(qtidataservices_app)
+add_hwservice(vendor_qtidataservices_app, vendor_hal_cacert_hwservice)
+hwbinder_use(vendor_qtidataservices_app)
-get_prop(qtidataservices_app, cnd_prop)
+get_prop(vendor_qtidataservices_app, vendor_cnd_prop)
-allow qtidataservices_app { app_api_service activity_service }:service_manager find;
-allow qtidataservices_app self:qipcrtr_socket create_socket_perms_no_ioctl;
-allow qtidataservices_app radio_data_file:dir r_dir_perms;
+allow vendor_qtidataservices_app { app_api_service activity_service }:service_manager find;
+allow vendor_qtidataservices_app self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow vendor_qtidataservices_app vendor_radio_data_file:dir r_dir_perms;
-allow qtidataservices_app hal_datafactory_hwservice:hwservice_manager find;
-allow qtidataservices_app hal_iwlan_hwservice:hwservice_manager find;
-allow qtidataservices_app radio_service:service_manager find;
+allow vendor_qtidataservices_app vendor_hal_datafactory_hwservice:hwservice_manager find;
+allow vendor_qtidataservices_app vendor_hal_iwlan_hwservice:hwservice_manager find;
+allow vendor_qtidataservices_app radio_service:service_manager find;
-allow qtidataservices_app sysfs_data:file r_file_perms;
+allow vendor_qtidataservices_app vendor_sysfs_data:file r_file_perms;
-binder_call(qtidataservices_app, cnd)
-binder_call(qtidataservices_app, rild)
-binder_call(qtidataservices_app, location)
+binder_call(vendor_qtidataservices_app, vendor_cnd)
+binder_call(vendor_qtidataservices_app, rild)
+binder_call(vendor_qtidataservices_app, vendor_location)
-net_domain(qtidataservices_app)
-hal_client_domain(qtidataservices_app, hal_perf)
+net_domain(vendor_qtidataservices_app)
+hal_client_domain(vendor_qtidataservices_app, vendor_hal_perf)
diff --git a/generic/vendor/common/radio.te b/generic/vendor/common/radio.te
index 74a77b2..5d40bed 100644
--- a/generic/vendor/common/radio.te
+++ b/generic/vendor/common/radio.te
@@ -24,16 +24,16 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-get_prop(radio, ims_prop)
+get_prop(radio, vendor_ims_prop)
allow radio vendor_file:lnk_file r_file_perms;
allow radio vendor_framework_file:file r_file_perms;
allow radio vendor_framework_file:dir search;
hwbinder_use(radio)
-allow radio vnd_ims_radio_hwservice:hwservice_manager find;
-allow radio vnd_qcrilhook_hwservice:hwservice_manager find;
-allow radio hal_imsrtp_hwservice:hwservice_manager find;
+allow radio vendor_vnd_ims_radio_hwservice:hwservice_manager find;
+allow radio vendor_vnd_qcrilhook_hwservice:hwservice_manager find;
+allow radio vendor_hal_imsrtp_hwservice:hwservice_manager find;
add_service(radio, radio_service)
allow radio {
@@ -41,16 +41,16 @@
}:service_manager find;
# IMS needs permission to use avtimer
-allow radio avtimer_device:chr_file r_file_perms;
+allow radio vendor_avtimer_device:chr_file r_file_perms;
# permissions for RCS clients to communicate with RCS vendor service
userdebug_or_eng(`
- allow radio hal_imsrcsd_hwservice:hwservice_manager find;
- binder_call(radio, hal_rcsservice);
+ allow radio vendor_hal_imsrcsd_hwservice:hwservice_manager find;
+ binder_call(radio, vendor_hal_rcsservice);
')
-binder_call(radio, hal_imsrtp)
+binder_call(radio, vendor_hal_imsrtp)
#perf
-hal_client_domain(radio, hal_perf)
+hal_client_domain(radio, vendor_hal_perf)
#diag
userdebug_or_eng(`
diff --git a/generic/vendor/common/recovery.te b/generic/vendor/common/recovery.te
index 124aeb8..61b14ac 100644
--- a/generic/vendor/common/recovery.te
+++ b/generic/vendor/common/recovery.te
@@ -26,9 +26,9 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
recovery_only(`
- # Search and Read access for sysfs_graphics for backlight
- allow recovery sysfs_graphics:dir search;
- allow recovery sysfs_graphics:file rw_file_perms;
+ # Search and Read access for vendor_sysfs_graphics for backlight
+ allow recovery vendor_sysfs_graphics:dir search;
+ allow recovery vendor_sysfs_graphics:file rw_file_perms;
# Read files on /sdcard
allow recovery sdcard_type:dir r_dir_perms;
allow recovery sdcard_type:file r_file_perms;
@@ -38,9 +38,9 @@
allow recovery system_data_file:file r_file_perms;
allow recovery system_data_file:dir r_dir_perms;
allow recovery cache_file:dir mounton;
- allow recovery sg_device:chr_file rw_file_perms;
+ allow recovery vendor_sg_device:chr_file rw_file_perms;
allow recovery self:capability sys_rawio;
- allow recovery sg_device:chr_file ioctl;
+ allow recovery vendor_sg_device:chr_file ioctl;
allow recovery sysfs_dm:dir r_dir_perms;
allow recovery sysfs_dm:file r_file_perms;
')
diff --git a/generic/vendor/common/rfs_access.te b/generic/vendor/common/rfs_access.te
index 2e3ddae..68a4f10 100644
--- a/generic/vendor/common/rfs_access.te
+++ b/generic/vendor/common/rfs_access.te
@@ -24,34 +24,34 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type rfs_access, domain;
-type rfs_access_exec, exec_type, vendor_file_type, file_type;
+type vendor_rfs_access, domain;
+type vendor_rfs_access_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(rfs_access)
+init_daemon_domain(vendor_rfs_access)
#For tftp server
-allow rfs_access self:capability { chown setgid setpcap setuid net_bind_service };
+allow vendor_rfs_access self:capability { chown setgid setpcap setuid net_bind_service };
-wakelock_use(rfs_access)
+wakelock_use(vendor_rfs_access)
-type_transition rfs_access mnt_vendor_file:{ dir file } persist_rfs_file;
-type_transition rfs_access mnt_vendor_file:dir persist_rfs_shared_hlos_file "hlos_rfs";
+type_transition vendor_rfs_access mnt_vendor_file:{ dir file } vendor_persist_rfs_file;
+type_transition vendor_rfs_access mnt_vendor_file:dir vendor_persist_rfs_shared_hlos_file "hlos_rfs";
-r_dir_file(rfs_access, firmware_file);
+r_dir_file(vendor_rfs_access, firmware_file);
-allow rfs_access mnt_vendor_file:dir create_dir_perms;
+allow vendor_rfs_access mnt_vendor_file:dir create_dir_perms;
-allow rfs_access persist_rfs_file:dir search;
-allow rfs_access persist_rfs_file:dir create_dir_perms;
-allow rfs_access persist_rfs_file:file create_file_perms;
-allow rfs_access persist_rfs_shared_hlos_file:dir create_dir_perms;
-allow rfs_access persist_rfs_shared_hlos_file:file create_file_perms;
+allow vendor_rfs_access vendor_persist_rfs_file:dir search;
+allow vendor_rfs_access vendor_persist_rfs_file:dir create_dir_perms;
+allow vendor_rfs_access vendor_persist_rfs_file:file create_file_perms;
+allow vendor_rfs_access vendor_persist_rfs_shared_hlos_file:dir create_dir_perms;
+allow vendor_rfs_access vendor_persist_rfs_shared_hlos_file:file create_file_perms;
#For QMI sockets and IPCR Sockets
-allow rfs_access self:{ socket qipcrtr_socket } create_socket_perms_no_ioctl;
+allow vendor_rfs_access self:{ socket qipcrtr_socket } create_socket_perms_no_ioctl;
-allow rfs_access vendor_tombstone_data_file:dir create_dir_perms;
-allow rfs_access vendor_tombstone_data_file:file create_file_perms;
+allow vendor_rfs_access vendor_tombstone_data_file:dir create_dir_perms;
+allow vendor_rfs_access vendor_tombstone_data_file:file create_file_perms;
#For access to the kmsg device
-allow rfs_access kmsg_device:chr_file w_file_perms;
+allow vendor_rfs_access kmsg_device:chr_file w_file_perms;
diff --git a/generic/vendor/common/rild.te b/generic/vendor/common/rild.te
index 429445a..e61acb0 100644
--- a/generic/vendor/common/rild.te
+++ b/generic/vendor/common/rild.te
@@ -25,43 +25,43 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
binder_call(rild, vendor_per_mgr)
-binder_call(rild, qtidataservices_app)
+binder_call(rild, vendor_qtidataservices_app)
vndbinder_use(rild)
-allow rild netmgrd_socket:dir search;
-unix_socket_connect(rild, netmgrd, netmgrd)
+allow rild vendor_netmgrd_socket:dir search;
+unix_socket_connect(rild, vendor_netmgrd, vendor_netmgrd)
allow rild vendor_file:file { execute_no_trans lock ioctl };
allow rild self:tipc_socket { create_socket_perms_no_ioctl };
allow rild vendor_per_mgr_service:service_manager find;
-add_hwservice(rild, vnd_ims_radio_hwservice)
-add_hwservice(rild, vnd_qcrilhook_hwservice)
+add_hwservice(rild, vendor_vnd_ims_radio_hwservice)
+add_hwservice(rild, vendor_vnd_qcrilhook_hwservice)
allow rild self:socket ioctl;
allowxperm rild self:socket ioctl msm_sock_ipc_ioctls;
-allow rild time_daemon:unix_stream_socket connectto;
+allow rild vendor_time_daemon:unix_stream_socket connectto;
-allow rild radio_vendor_data_file:dir rw_dir_perms;
-allow rild radio_vendor_data_file:file create_file_perms;
+allow rild vendor_radio_vendor_data_file:dir rw_dir_perms;
+allow rild vendor_radio_vendor_data_file:file create_file_perms;
userdebug_or_eng(`
- allow rild diag_device:chr_file rw_file_perms;
+ allow rild vendor_diag_device:chr_file rw_file_perms;
get_prop(rild, vendor_pd_locater_dbg_prop)
')
hal_server_domain(rild, hal_secure_element)
-add_hwservice(rild, hal_iwlan_hwservice)
+add_hwservice(rild, vendor_hal_iwlan_hwservice)
-add_hwservice(rild, hal_dataconnection_hwservice)
-hal_server_domain(rild, hal_dataconnection_qti)
+add_hwservice(rild, vendor_hal_dataconnection_hwservice)
+hal_server_domain(rild, vendor_hal_dataconnection_qti)
get_prop(rild, exported3_radio_prop)
get_prop(rild, vendor_dataqdp_prop)
-allow rild qmuxd_socket:dir w_dir_perms;
-allow rild qmuxd_socket:sock_file create_file_perms;
+allow rild vendor_qmuxd_socket:dir w_dir_perms;
+allow rild vendor_qmuxd_socket:sock_file create_file_perms;
r_dir_file(rild, vendor_mbn_data_file)
allow rild self:qipcrtr_socket create_socket_perms_no_ioctl;
diff --git a/generic/vendor/common/rmt_storage.te b/generic/vendor/common/rmt_storage.te
index 8c50157..e063446 100644
--- a/generic/vendor/common/rmt_storage.te
+++ b/generic/vendor/common/rmt_storage.te
@@ -24,35 +24,35 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type rmt_storage, domain;
-type rmt_storage_exec, exec_type, vendor_file_type, file_type;
+type vendor_rmt_storage, domain;
+type vendor_rmt_storage_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(rmt_storage)
+init_daemon_domain(vendor_rmt_storage)
-wakelock_use(rmt_storage)
+wakelock_use(vendor_rmt_storage)
-allow rmt_storage self:capability { net_bind_service setgid setpcap setuid };
+allow vendor_rmt_storage self:capability { net_bind_service setgid setpcap setuid };
-set_prop(rmt_storage, ctl_vendor_rmt_storage_prop)
+set_prop(vendor_rmt_storage, vendor_ctl_vendor_rmt_storage_prop)
-allow rmt_storage cgroup:dir create_dir_perms;
-allow rmt_storage uio_device:chr_file rw_file_perms;
+allow vendor_rmt_storage cgroup:dir create_dir_perms;
+allow vendor_rmt_storage uio_device:chr_file rw_file_perms;
-allow rmt_storage self:{ socket qipcrtr_socket } create_socket_perms;
-allowxperm rmt_storage self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+allow vendor_rmt_storage self:{ socket qipcrtr_socket } create_socket_perms;
+allowxperm vendor_rmt_storage self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
-allow rmt_storage kmsg_device:chr_file w_file_perms;
+allow vendor_rmt_storage kmsg_device:chr_file w_file_perms;
-r_dir_file(rmt_storage, sysfs_uio)
-r_dir_file(rmt_storage, sysfs_uio_file)
+r_dir_file(vendor_rmt_storage, sysfs_uio)
+r_dir_file(vendor_rmt_storage, vendor_sysfs_uio_file)
-allow rmt_storage block_device:dir r_dir_perms;
+allow vendor_rmt_storage block_device:dir r_dir_perms;
-allow rmt_storage {
- modem_efs_partition_device
- ssd_block_device
+allow vendor_rmt_storage {
+ vendor_modem_efs_partition_device
+ vendor_ssd_block_device
}:blk_file rw_file_perms;
-r_dir_file(rmt_storage, sysfs_ssr)
-r_dir_file(rmt_storage, sysfs_data)
-set_prop(rmt_storage, ctl_vendor_rmt_storage_prop)
+r_dir_file(vendor_rmt_storage, vendor_sysfs_ssr)
+r_dir_file(vendor_rmt_storage, vendor_sysfs_data)
+set_prop(vendor_rmt_storage, vendor_ctl_vendor_rmt_storage_prop)
diff --git a/generic/vendor/common/seapp_contexts b/generic/vendor/common/seapp_contexts
index ed76f8d..6c09d05 100644
--- a/generic/vendor/common/seapp_contexts
+++ b/generic/vendor/common/seapp_contexts
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+#Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@@ -31,10 +31,10 @@
user=_app seinfo=platform name=com.qualcomm.telephony domain=qtelephony type=app_data_file levelFrom=all
#add new domain for qtidataservices
-user=radio seinfo=platform name=.qtidataservices domain=qtidataservices_app type=radio_data_file
+user=radio seinfo=platform name=.qtidataservices domain=vendor_qtidataservices_app type=radio_data_file
#Add new domain for imshelper service
-user=radio seinfo=platform name=.imshelperservice domain=imshelper_app type=imshelper_app_data_file
+user=radio seinfo=platform name=.imshelperservice domain=vendor_imshelper_app type=vendor_imshelper_app_data_file
#Add new domain for power off alarm app
-user=system seinfo=platform name=com.qualcomm.qti.poweroffalarm domain=poweroffalarm_app type=system_app_data_file
+user=system seinfo=platform name=com.qualcomm.qti.poweroffalarm domain=vendor_poweroffalarm_app type=system_app_data_file
diff --git a/generic/vendor/common/sensors.te b/generic/vendor/common/sensors.te
index b9091e5..4adaa4d 100644
--- a/generic/vendor/common/sensors.te
+++ b/generic/vendor/common/sensors.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Policy for sensor daemon
-type sensors, domain;
-type sensors_exec, exec_type, vendor_file_type, file_type;
+type vendor_sensors, domain;
+type vendor_sensors_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(sensors)
-get_prop(sensors, sensors_prop)
+init_daemon_domain(vendor_sensors)
+get_prop(vendor_sensors, vendor_sensors_prop)
-allow sensors self:capability {
+allow vendor_sensors self:capability {
setuid
setgid
net_bind_service
@@ -39,41 +39,41 @@
# Access to tests from userdebug/eng builds
userdebug_or_eng(`
- diag_use(sensors)
- get_prop(sensors, sensors_dbg_prop)
+ diag_use(vendor_sensors)
+ get_prop(vendor_sensors, vendor_sensors_dbg_prop)
#allow starting of diag_mdlog
- allow sensors qlogd_exec:file rx_file_perms;
- allow sensors vendor_shell_exec:file rx_file_perms;
+ allow vendor_sensors vendor_qlogd_exec:file rx_file_perms;
+ allow vendor_sensors vendor_shell_exec:file rx_file_perms;
')
-allow sensors self:{ socket qipcrtr_socket } create_socket_perms;
+allow vendor_sensors self:{ socket qipcrtr_socket } create_socket_perms;
# ioctlcmd=c304
-allowxperm sensors self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+allowxperm vendor_sensors self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
-allow sensors mnt_vendor_file:dir r_dir_perms;
+allow vendor_sensors mnt_vendor_file:dir r_dir_perms;
-allow sensors sensors_vendor_data_file:dir create_dir_perms;
-allow sensors sensors_vendor_data_file:file create_file_perms;
+allow vendor_sensors vendor_sensors_vendor_data_file:dir create_dir_perms;
+allow vendor_sensors vendor_sensors_vendor_data_file:file create_file_perms;
-allow sensors system_file:dir r_dir_perms;
-allow sensors sensors_device:chr_file rw_file_perms;
+allow vendor_sensors system_file:dir r_dir_perms;
+allow vendor_sensors sensors_device:chr_file rw_file_perms;
-allow sensors sysfs_soc:file w_file_perms;
-allow sensors sysfs_data:file r_file_perms;
+allow vendor_sensors vendor_sysfs_soc:file w_file_perms;
+allow vendor_sensors vendor_sysfs_data:file r_file_perms;
-allow sensors ion_device:chr_file r_file_perms;
-allow sensors qdsp_device:chr_file r_file_perms;
-allow sensors xdsp_device:chr_file r_file_perms;
+allow vendor_sensors ion_device:chr_file r_file_perms;
+allow vendor_sensors vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_sensors vendor_xdsp_device:chr_file r_file_perms;
# For reading dir/files on /dsp
-r_dir_file(sensors, adsprpcd_file)
+r_dir_file(vendor_sensors, adsprpcd_file)
# For reading adsprpc_prop
-get_prop(sensors, vendor_adsprpc_prop)
+get_prop(vendor_sensors, vendor_adsprpc_prop)
-allow sensors persist_sensors_file:fifo_file create_file_perms;
-# Access to /persist/sensors
-allow sensors persist_sensors_file:dir create_dir_perms;
-allow sensors persist_sensors_file:file create_file_perms;
+allow vendor_sensors vendor_persist_sensors_file:fifo_file create_file_perms;
+# Access to /persist/vendor_sensors
+allow vendor_sensors vendor_persist_sensors_file:dir create_dir_perms;
+allow vendor_sensors vendor_persist_sensors_file:file create_file_perms;
# Access to wakelock sysfs
-wakelock_use(sensors)
+wakelock_use(vendor_sensors)
diff --git a/generic/vendor/common/service.te b/generic/vendor/common/service.te
index ddecb42..1c585f3 100644
--- a/generic/vendor/common/service.te
+++ b/generic/vendor/common/service.te
@@ -24,4 +24,4 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type imsuce_service, service_manager_type;
+type vendor_imsuce_service, service_manager_type;
diff --git a/generic/vendor/common/service_contexts b/generic/vendor/common/service_contexts
index 860ef98..b37b0f5 100644
--- a/generic/vendor/common/service_contexts
+++ b/generic/vendor/common/service_contexts
@@ -24,6 +24,6 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-rcs u:object_r:radio_service:s0
-com.fingerprints.extension.IFingerprintNavigation u:object_r:fingerprint_service:s0
-com.qualcomm.qti.uceservice u:object_r:imsuce_service:s0
+rcs u:object_r:vendor_radio_service:s0
+com.fingerprints.extension.IFingerprintNavigation u:object_r:vendor_fingerprint_service:s0
+com.qualcomm.qti.uceservice u:object_r:vendor_imsuce_service:s0
diff --git a/generic/vendor/common/ssr_setup.te b/generic/vendor/common/ssr_setup.te
index 56433ea..2e38639 100644
--- a/generic/vendor/common/ssr_setup.te
+++ b/generic/vendor/common/ssr_setup.te
@@ -30,10 +30,10 @@
init_daemon_domain(vendor_ssr_setup);
# Required to enable/disable ssr
-allow vendor_ssr_setup sysfs_ssr:lnk_file w_file_perms;
-allow vendor_ssr_setup sysfs_ssr_toggle:file rw_file_perms;
-allow vendor_ssr_setup sysfs_ssr:file rw_file_perms;
+allow vendor_ssr_setup vendor_sysfs_ssr:lnk_file w_file_perms;
+allow vendor_ssr_setup vendor_sysfs_ssr_toggle:file rw_file_perms;
+allow vendor_ssr_setup vendor_sysfs_ssr:file rw_file_perms;
-allow vendor_ssr_setup sysfs_data:file r_file_perms;
+allow vendor_ssr_setup vendor_sysfs_data:file r_file_perms;
get_prop(vendor_ssr_setup, vendor_ssr_prop)
diff --git a/generic/vendor/common/subsystem_ramdump.te b/generic/vendor/common/subsystem_ramdump.te
index 94503b1..60ab760 100644
--- a/generic/vendor/common/subsystem_ramdump.te
+++ b/generic/vendor/common/subsystem_ramdump.te
@@ -32,12 +32,12 @@
init_daemon_domain(vendor_subsystem_ramdump);
allow vendor_subsystem_ramdump device:dir r_dir_perms;
- allow vendor_subsystem_ramdump ramdump_device:chr_file r_file_perms;
+ allow vendor_subsystem_ramdump vendor_ramdump_device:chr_file r_file_perms;
r_dir_file(vendor_subsystem_ramdump, sysfs_type);
- allow vendor_subsystem_ramdump ramdump_vendor_data_file:dir rw_dir_perms;
- allow vendor_subsystem_ramdump ramdump_vendor_data_file:file create_file_perms;
+ allow vendor_subsystem_ramdump vendor_ramdump_vendor_data_file:dir rw_dir_perms;
+ allow vendor_subsystem_ramdump vendor_ramdump_vendor_data_file:file create_file_perms;
set_prop(vendor_subsystem_ramdump, vendor_ssr_prop);
diff --git a/generic/vendor/common/surfaceflinger.te b/generic/vendor/common/surfaceflinger.te
index 91113c9..8ea8e6c 100644
--- a/generic/vendor/common/surfaceflinger.te
+++ b/generic/vendor/common/surfaceflinger.te
@@ -27,14 +27,14 @@
dontaudit surfaceflinger firmware_file:dir search;
dontaudit surfaceflinger kernel:system module_request;
-allow surfaceflinger sysfs_graphics:file rw_file_perms;
+allow surfaceflinger vendor_sysfs_graphics:file rw_file_perms;
get_prop(surfaceflinger, vendor_gralloc_prop)
get_prop(surfaceflinger, vendor_display_prop)
#Allow access to binder callback's to perf hal
-hal_client_domain(surfaceflinger, hal_perf)
+hal_client_domain(surfaceflinger, vendor_hal_perf)
-r_dir_file(surfaceflinger, sysfs_kgsl)
+r_dir_file(surfaceflinger, vendor_sysfs_kgsl)
-dontaudit surfaceflinger hal_qspmhal_hwservice:hwservice_manager find;
+dontaudit surfaceflinger vendor_hal_qspmhal_hwservice:hwservice_manager find;
diff --git a/generic/vendor/common/system_app.te b/generic/vendor/common/system_app.te
index 3c4fc05..5f3d8a5 100755
--- a/generic/vendor/common/system_app.te
+++ b/generic/vendor/common/system_app.te
@@ -29,11 +29,11 @@
allow system_app elabel_data_file:file r_file_perms;
# Allow hbtp hal Service to be found
-hal_client_domain(system_app, hal_hbtp)
+hal_client_domain(system_app, vendor_hal_hbtp)
#secureUI
-hal_client_domain(system_app, hal_qdutils_disp);
-hal_client_domain(system_app, hal_tui_comm);
+hal_client_domain(system_app, vendor_hal_qdutils_disp);
+hal_client_domain(system_app, vendor_hal_tui_comm);
get_prop(system_app, vendor_radio_prop)
-hal_client_domain(system_app, hal_capabilityconfigstore_qti);
+hal_client_domain(system_app, vendor_hal_capabilityconfigstore_qti);
diff --git a/generic/vendor/common/system_server.te b/generic/vendor/common/system_server.te
index bee9d5a..c14e209 100644
--- a/generic/vendor/common/system_server.te
+++ b/generic/vendor/common/system_server.te
@@ -31,15 +31,15 @@
binder_call(system_server, hal_graphics_composer)
-# location
-binder_call(system_server, location);
-allow system_server wlan_device:chr_file rw_file_perms;
+# vendor_location
+binder_call(system_server, vendor_location);
+allow system_server vendor_wlan_device:chr_file rw_file_perms;
allow system_server hal_audio_default:file w_file_perms;
-allow system_server sysfs_sensors:dir search;
-allow system_server sysfs_sensors:file rw_file_perms;
+allow system_server vendor_sysfs_sensors:dir search;
+allow system_server vendor_sysfs_sensors:file rw_file_perms;
# allow access to low persistence mode sysfs node
-allow system_server sysfs_graphics:file rw_file_perms;
+allow system_server vendor_sysfs_graphics:file rw_file_perms;
userdebug_or_eng(`
diag_use(system_server)
@@ -51,4 +51,4 @@
# allow system_server to read/acess peripheral manager.
get_prop(system_server, vendor_per_mgr_state_prop);
-hal_client_domain(system_server, hal_dataconnection_qti)
+hal_client_domain(system_server, vendor_hal_dataconnection_qti)
diff --git a/generic/vendor/common/systemhelper_app.te b/generic/vendor/common/systemhelper_app.te
index 6fbf24a..8ac3956 100644
--- a/generic/vendor/common/systemhelper_app.te
+++ b/generic/vendor/common/systemhelper_app.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(systemhelper_app, hal_trustedui_qti)
+binder_call(systemhelper_app, vendor_hal_trustedui_qti)
diff --git a/generic/vendor/common/te_macros b/generic/vendor/common/te_macros
index a013d34..ddf1058 100644
--- a/generic/vendor/common/te_macros
+++ b/generic/vendor/common/te_macros
@@ -31,9 +31,9 @@
# Also allow the client domain to remove
# its own socket.
define(`qmux_socket', `
-allow $1 qmuxd_socket:dir create_dir_perms;
-unix_socket_connect($1, qmuxd, qmuxd)
-allow $1 qmuxd_socket:sock_file { read getattr write setattr create unlink };
+allow $1 vendor_qmuxd_socket:dir create_dir_perms;
+unix_socket_connect($1, vendor_qmuxd, vendor_qmuxd)
+allow $1 vendor_qmuxd_socket:sock_file { read getattr write setattr create unlink };
')
#####################################
@@ -43,9 +43,9 @@
# Also allow the client domain to remove
# its own socket.
define(`netmgr_socket', `
-allow $1 netmgrd_socket:dir r_dir_perms;
-unix_socket_connect($1, netmgrd, netmgrd)
-allow $1 netmgrd_socket:sock_file { read getattr write };
+allow $1 vendor_netmgrd_socket:dir r_dir_perms;
+unix_socket_connect($1, vendor_netmgrd, vendor_netmgrd)
+allow $1 vendor_netmgrd_socket:sock_file { read getattr write };
')
#####################################
@@ -55,9 +55,9 @@
# Also allow the client domain to remove
# its own socket.
define(`portbridge_socket', `
-allow $1 port-bridge_socket:dir r_dir_perms;
-unix_socket_connect($1, port-bridge, port-bridge)
-allow $1 port-bridge_socket:sock_file { read write };
+allow $1 vendor_port-bridge_socket:dir r_dir_perms;
+unix_socket_connect($1, vendor_port-bridge, vendor_port-bridge)
+allow $1 vendor_port-bridge_socket:sock_file { read write };
')
########################################
@@ -74,21 +74,21 @@
#####################################
# cnd_nims_socket_perm(clientdomain)
-# allow cnd to read /proc/pid/cmdline to get appname
-# allow cnd to use inet socket created by app.
+# allow vendor_cnd to read /proc/pid/cmdline to get appname
+# allow vendor_cnd to use inet socket created by app.
define(`cnd_nims_socket_perm', `
-allow cnd $1:dir r_dir_perms;
-allow cnd $1:file r_file_perms;
-allow cnd $1:fd use;
-allow cnd $1:tcp_socket rw_socket_perms;
+allow vendor_cnd $1:dir r_dir_perms;
+allow vendor_cnd $1:file r_file_perms;
+allow vendor_cnd $1:fd use;
+allow vendor_cnd $1:tcp_socket rw_socket_perms;
')
#####################################
# diag_use(clientdomain)
# allow clientdomain to read/write to diag
define(`diag_use', `
-r_dir_file($1, sysfs_diag)
-allow $1 diag_device:chr_file rw_file_perms;
+r_dir_file($1, vendor_sysfs_diag)
+allow $1 vendor_diag_device:chr_file rw_file_perms;
')
#####################################
@@ -129,9 +129,9 @@
# Allow client domain to connecto and send
# via a local socket to the qdma domain.
define(`qdma_file_socket', `
-allow $1 qdma_socket:dir r_dir_perms;
-allow $1 qdma_socket:sock_file { read getattr write };
-allow $1 qdma_app:unix_stream_socket { connectto };
+allow $1 vendor_qdma_socket:dir r_dir_perms;
+allow $1 vendor_qdma_socket:sock_file { read getattr write };
+allow $1 vendor_qdma_app:unix_stream_socket { connectto };
')
#####################################
@@ -150,8 +150,8 @@
init_daemon_domain($1);
typeattribute $1 data_between_core_and_vendor_violators;
typeattribute $1 coredomain;
-allow $1 shell_exec:file rx_file_perms;
-allow $1 toolbox_exec:file rx_file_perms;
+allow $1 vendor_shell_exec:file rx_file_perms;
+allow $1 vendor_toolbox_exec:file rx_file_perms;
allow $1 file_contexts_file:file { read getattr open };
allow $1 $2:file { getattr setattr relabelfrom rename };
allow $1 $2:dir { reparent rename rmdir setattr rw_dir_perms relabelfrom };
diff --git a/generic/vendor/common/tee.te b/generic/vendor/common/tee.te
index 85b42d9..693f942 100644
--- a/generic/vendor/common/tee.te
+++ b/generic/vendor/common/tee.te
@@ -32,30 +32,30 @@
allow tee firmware_file:dir search;
allow tee block_device:dir { getattr search };
-allow tee rpmb_device:blk_file rw_file_perms;
-allow tee ssd_block_device:blk_file rw_file_perms;
-allow tee sg_device:chr_file { rw_file_perms setattr };
+allow tee vendor_rpmb_device:blk_file rw_file_perms;
+allow tee vendor_ssd_block_device:blk_file rw_file_perms;
+allow tee vendor_sg_device:chr_file { rw_file_perms setattr };
allow tee mnt_vendor_file:dir r_dir_perms;
-allow tee persist_drm_file:dir create_dir_perms;
-allow tee persist_drm_file:file create_file_perms;
-allow tee persist_data_file:dir create_dir_perms;
-allow tee persist_data_file:file create_file_perms;
+allow tee vendor_persist_drm_file:dir create_dir_perms;
+allow tee vendor_persist_drm_file:file create_file_perms;
+allow tee vendor_persist_data_file:dir create_dir_perms;
+allow tee vendor_persist_data_file:file create_file_perms;
-allow tee time_daemon:unix_stream_socket connectto;
+allow tee vendor_time_daemon:unix_stream_socket connectto;
# Allow SFS to write to data partition
-allow tee data_tzstorage_file:dir create_dir_perms;
-allow tee data_tzstorage_file:file create_file_perms;
+allow tee vendor_data_tzstorage_file:dir create_dir_perms;
+allow tee vendor_data_tzstorage_file:file create_file_perms;
#secureUI
-hal_client_domain(tee, hal_tui_comm);
-hal_client_domain(tee, hal_qdutils_disp);
+hal_client_domain(tee, vendor_hal_tui_comm);
+hal_client_domain(tee, vendor_hal_qdutils_disp);
hal_client_domain(tee, hal_graphics_allocator);
vndbinder_use(tee);
-allow tee qdisplay_service:service_manager find;
+allow tee vendor_qdisplay_service:service_manager find;
hal_client_domain(tee, hal_graphics_composer);
-allow tee sysfs_sectouch:file rw_file_perms;
+allow tee vendor_sysfs_sectouch:file rw_file_perms;
allow tee vendor_tui_data_file:file rw_file_perms;
allow tee vendor_tui_data_file:dir r_dir_perms;
allow tee graphics_device:chr_file rw_file_perms;
diff --git a/generic/vendor/common/thermal-engine.te b/generic/vendor/common/thermal-engine.te
index aeea527..a8c1e0f 100644
--- a/generic/vendor/common/thermal-engine.te
+++ b/generic/vendor/common/thermal-engine.te
@@ -24,84 +24,84 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type thermal-engine, domain;
-type thermal-engine_exec, exec_type, vendor_file_type, file_type;
+type vendor_thermal-engine, domain;
+type vendor_thermal-engine_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(thermal-engine)
+init_daemon_domain(vendor_thermal-engine)
# to read /sys/devices
-allow thermal-engine sysfs:dir r_dir_perms;
+allow vendor_thermal-engine sysfs:dir r_dir_perms;
-allow thermal-engine self:capability {
+allow vendor_thermal-engine self:capability {
fsetid
sys_boot
};
-allow thermal-engine self:{ socket qipcrtr_socket } create_socket_perms;
+allow vendor_thermal-engine self:{ socket qipcrtr_socket } create_socket_perms;
# ioctlcmd=c304
-allowxperm thermal-engine self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+allowxperm vendor_thermal-engine self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
# This is required to access thermal sockets
-allow thermal-engine thermal_socket:dir w_dir_perms;
-allow thermal-engine thermal_socket:sock_file create_file_perms;
-allow thermal-engine socket_device:dir w_dir_perms;
+allow vendor_thermal-engine vendor_thermal_socket:dir w_dir_perms;
+allow vendor_thermal-engine vendor_thermal_socket:sock_file create_file_perms;
+allow vendor_thermal-engine socket_device:dir w_dir_perms;
# This is required for thermal sysfs access
-r_dir_file(thermal-engine, sysfs_thermal)
-allow thermal-engine sysfs_thermal:file w_file_perms;
-allow thermal-engine sysfs_thermal:lnk_file r_file_perms;
+r_dir_file(vendor_thermal-engine, sysfs_thermal)
+allow vendor_thermal-engine sysfs_thermal:file w_file_perms;
+allow vendor_thermal-engine sysfs_thermal:lnk_file r_file_perms;
# Allow to read and write cpufreq sysfs
-allow thermal-engine sysfs_devices_system_cpu:file rw_file_perms;
+allow vendor_thermal-engine sysfs_devices_system_cpu:file rw_file_perms;
# This is required for qmi access
-qmux_socket(thermal-engine);
+qmux_socket(vendor_thermal-engine);
#This is to allow access to uio device
-allow thermal-engine uio_device:chr_file rw_file_perms;
+allow vendor_thermal-engine uio_device:chr_file rw_file_perms;
userdebug_or_eng(`
- diag_use(thermal-engine)
+ diag_use(vendor_thermal-engine)
')
# To search, read and write kgsl sysfs
-allow thermal-engine sysfs_kgsl:dir r_dir_perms;
-allow thermal-engine sysfs_kgsl:file rw_file_perms;
-allow thermal-engine sysfs_kgsl:lnk_file r_file_perms;
+allow vendor_thermal-engine vendor_sysfs_kgsl:dir r_dir_perms;
+allow vendor_thermal-engine vendor_sysfs_kgsl:file rw_file_perms;
+allow vendor_thermal-engine vendor_sysfs_kgsl:lnk_file r_file_perms;
-allow thermal-engine sysfs_data:file r_file_perms;
+allow vendor_thermal-engine vendor_sysfs_data:file r_file_perms;
# This is required read and write battery power supply sysfs
-allow thermal-engine sysfs_battery_supply:dir r_dir_perms;
-allow thermal-engine sysfs_battery_supply:file rw_file_perms;
-allow thermal-engine sysfs_battery_supply:lnk_file r_file_perms;
+allow vendor_thermal-engine vendor_sysfs_battery_supply:dir r_dir_perms;
+allow vendor_thermal-engine vendor_sysfs_battery_supply:file rw_file_perms;
+allow vendor_thermal-engine vendor_sysfs_battery_supply:lnk_file r_file_perms;
# This is required to read and write lcd-backlight sysfs
-allow thermal-engine sysfs_graphics:dir r_dir_perms;
-allow thermal-engine sysfs_graphics:file rw_file_perms;
-allow thermal-engine sysfs_graphics:lnk_file r_file_perms;
+allow vendor_thermal-engine vendor_sysfs_graphics:dir r_dir_perms;
+allow vendor_thermal-engine vendor_sysfs_graphics:file rw_file_perms;
+allow vendor_thermal-engine vendor_sysfs_graphics:lnk_file r_file_perms;
-r_dir_file(thermal-engine, sysfs_leds)
-allow thermal-engine audio_device:chr_file rw_file_perms;
+r_dir_file(vendor_thermal-engine, sysfs_leds)
+allow vendor_thermal-engine audio_device:chr_file rw_file_perms;
# reboot/shutdown for thermal limits exceeded
-set_prop(thermal-engine, powerctl_prop)
+set_prop(vendor_thermal-engine, powerctl_prop)
#sysfs_uio
-r_dir_file(thermal-engine, sysfs_uio)
-r_dir_file(thermal-engine, sysfs_uio_file)
+r_dir_file(vendor_thermal-engine, sysfs_uio)
+r_dir_file(vendor_thermal-engine, vendor_sysfs_uio_file)
# netlink access
-allow thermal-engine self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-#This is required to enable thermal-engine dsprpc communication
-r_dir_file(thermal-engine, adsprpcd_file);
-allow thermal-engine qdsp_device:chr_file r_file_perms;
-allow thermal-engine ion_device:chr_file r_file_perms;
+allow vendor_thermal-engine self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
+#This is required to enable vendor_thermal-engine dsprpc communication
+r_dir_file(vendor_thermal-engine, adsprpcd_file);
+allow vendor_thermal-engine vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_thermal-engine ion_device:chr_file r_file_perms;
# This is required to read devfreq sysfs
-allow thermal-engine sysfs_devfreq:dir r_dir_perms;
-allow thermal-engine sysfs_devfreq:file r_file_perms;
-allow thermal-engine sysfs_devfreq:lnk_file r_file_perms;
+allow vendor_thermal-engine vendor_sysfs_devfreq:dir r_dir_perms;
+allow vendor_thermal-engine vendor_sysfs_devfreq:file r_file_perms;
+allow vendor_thermal-engine vendor_sysfs_devfreq:lnk_file r_file_perms;
#This is required to write into limits-cdsp partition
-allow thermal-engine block_device:dir r_dir_perms;
-allow thermal-engine limits_block_device:blk_file rw_file_perms;
+allow vendor_thermal-engine block_device:dir r_dir_perms;
+allow vendor_thermal-engine vendor_limits_block_device:blk_file rw_file_perms;
diff --git a/generic/vendor/common/time_daemon.te b/generic/vendor/common/time_daemon.te
index 426679f..6a644d5 100644
--- a/generic/vendor/common/time_daemon.te
+++ b/generic/vendor/common/time_daemon.te
@@ -26,27 +26,27 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Policies for time daemon
-type time_daemon, domain, mlstrustedsubject;
-type time_daemon_exec, exec_type, vendor_file_type, file_type;
+type vendor_time_daemon, domain, mlstrustedsubject;
+type vendor_time_daemon_exec, exec_type, vendor_file_type, file_type;
-# Make transition to its own time_daemon domain from init
-init_daemon_domain(time_daemon)
-allow time_daemon smem_log_device:chr_file rw_file_perms;
+# Make transition to its own vendor_time_daemon domain from init
+init_daemon_domain(vendor_time_daemon)
+allow vendor_time_daemon vendor_smem_log_device:chr_file rw_file_perms;
# Add rules for access permissions
-allow time_daemon rtc_device:chr_file r_file_perms;
+allow vendor_time_daemon rtc_device:chr_file r_file_perms;
-allow time_daemon vendor_time_data_file:file create_file_perms;
-allow time_daemon vendor_time_data_file:dir w_dir_perms;
-allow time_daemon self:qipcrtr_socket create_socket_perms_no_ioctl;
-allow time_daemon self:capability sys_time;
+allow vendor_time_daemon vendor_time_data_file:file create_file_perms;
+allow vendor_time_daemon vendor_time_data_file:dir w_dir_perms;
+allow vendor_time_daemon self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow vendor_time_daemon self:capability sys_time;
-allow time_daemon persist_time_file:file create_file_perms;
-allow time_daemon persist_time_file:dir w_dir_perms;
+allow vendor_time_daemon vendor_persist_time_file:file create_file_perms;
+allow vendor_time_daemon vendor_persist_time_file:dir w_dir_perms;
-allow time_daemon mnt_vendor_file:dir search;
+allow vendor_time_daemon mnt_vendor_file:dir search;
-allow time_daemon sysfs_mhi:file r_file_perms;
-allow time_daemon sysfs_data:file r_file_perms;
+allow vendor_time_daemon vendor_sysfs_mhi:file r_file_perms;
+allow vendor_time_daemon vendor_sysfs_data:file r_file_perms;
-get_prop(time_daemon, vendor_time_service_prop);
+get_prop(vendor_time_daemon, vendor_time_service_prop);
diff --git a/generic/vendor/common/timeservice_app.te b/generic/vendor/common/timeservice_app.te
index 27a6a1e..3e3f6f3 100644
--- a/generic/vendor/common/timeservice_app.te
+++ b/generic/vendor/common/timeservice_app.te
@@ -25,10 +25,10 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type timeservice_app, domain;
-app_domain(timeservice_app);
+type vendor_timeservice_app, domain;
+app_domain(vendor_timeservice_app);
-allow timeservice_app app_api_service:service_manager find;
-allow timeservice_app time_daemon:unix_stream_socket connectto;
+allow vendor_timeservice_app app_api_service:service_manager find;
+allow vendor_timeservice_app vendor_time_daemon:unix_stream_socket connectto;
#allow timeservice to access perf hal
-hal_client_domain(timeservice_app, hal_perf);
+hal_client_domain(vendor_timeservice_app, vendor_hal_perf);
diff --git a/generic/vendor/common/tlocd.te b/generic/vendor/common/tlocd.te
index 2daa759..b4b6f19 100644
--- a/generic/vendor/common/tlocd.te
+++ b/generic/vendor/common/tlocd.te
@@ -25,26 +25,26 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type tlocd, domain;
-type tlocd_exec, exec_type, vendor_file_type, file_type;
+type vendor_tlocd, domain;
+type vendor_tlocd_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(tlocd)
+init_daemon_domain(vendor_tlocd)
-# Allow interracting with tlocd directory
-allow tlocd tlocd_data_file:dir create_dir_perms;
-allow tlocd tlocd_data_file:file create_file_perms;
+# Allow interracting with vendor_tlocd directory
+allow vendor_tlocd vendor_tlocd_data_file:dir create_dir_perms;
+allow vendor_tlocd vendor_tlocd_data_file:file create_file_perms;
# Allow interracting with qseecom
-allow tlocd tee_device:chr_file rw_file_perms;
+allow vendor_tlocd tee_device:chr_file rw_file_perms;
# Allow interracting with trust-zone
-r_dir_file(tlocd, firmware_file)
+r_dir_file(vendor_tlocd, firmware_file)
# Allow interracting with nqs fifos
-allow tlocd tlocd_data_file:fifo_file create_file_perms;
+allow vendor_tlocd vendor_tlocd_data_file:fifo_file create_file_perms;
#Allow access MODEM
-allow tlocd self:{ socket qipcrtr_socket } create_socket_perms;
-allowxperm tlocd self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+allow vendor_tlocd self:{ socket qipcrtr_socket } create_socket_perms;
+allowxperm vendor_tlocd self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
-allow tlocd ion_device:chr_file rw_file_perms;
+allow vendor_tlocd ion_device:chr_file rw_file_perms;
diff --git a/generic/vendor/common/ueventd.te b/generic/vendor/common/ueventd.te
index 1c72e47..1fd94bf 100644
--- a/generic/vendor/common/ueventd.te
+++ b/generic/vendor/common/ueventd.te
@@ -25,28 +25,28 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# For setting up various WIGIG files
-allow ueventd sysfs_bond0:file rw_file_perms;
+allow ueventd vendor_sysfs_bond0:file rw_file_perms;
-allow ueventd sysfs_usb_c:file w_file_perms;
+allow ueventd vendor_sysfs_usb_c:file w_file_perms;
allow ueventd {
{ sysfs_type - usermodehelper }
- sysfs_battery_supply
- sysfs_data
- sysfs_graphics
- sysfs_kgsl
+ vendor_sysfs_battery_supply
+ vendor_sysfs_data
+ vendor_sysfs_graphics
+ vendor_sysfs_kgsl
sysfs_leds
sysfs_net
- sysfs_scsi_host
- sysfs_usbpd_device
- sysfs_usb_supply
+ vendor_sysfs_scsi_host
+ vendor_sysfs_usbpd_device
+ vendor_sysfs_usb_supply
}:file w_file_perms;
allow ueventd firmware_file:dir search;
allow ueventd firmware_file:file r_file_perms;
allow ueventd tmpfs:blk_file getattr;
-allow ueventd persist_file:dir search;
-allow ueventd persist_file:file r_file_perms;
+allow ueventd vendor_persist_file:dir search;
+allow ueventd vendor_persist_file:file r_file_perms;
# For wifi to access mnt_vendor_file
r_dir_file(ueventd, mnt_vendor_file)
diff --git a/generic/vendor/common/vendor_hal_capabilityconfigstore_qti.te b/generic/vendor/common/vendor_hal_capabilityconfigstore_qti.te
index 811941e..f9792eb 100755
--- a/generic/vendor/common/vendor_hal_capabilityconfigstore_qti.te
+++ b/generic/vendor/common/vendor_hal_capabilityconfigstore_qti.te
@@ -25,7 +25,7 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(hal_capabilityconfigstore_qti_client, hal_capabilityconfigstore_qti_server)
-binder_call(hal_capabilityconfigstore_qti_server, hal_capabilityconfigstore_qti_client)
+binder_call(vendor_hal_capabilityconfigstore_qti_client, vendor_hal_capabilityconfigstore_qti_server)
+binder_call(vendor_hal_capabilityconfigstore_qti_server, vendor_hal_capabilityconfigstore_qti_client)
-hal_attribute_hwservice(hal_capabilityconfigstore_qti, hal_capabilityconfigstore_qti_hwservice)
+hal_attribute_hwservice(vendor_hal_capabilityconfigstore_qti, vendor_hal_capabilityconfigstore_qti_hwservice)
diff --git a/generic/vendor/common/vendor_hal_capabilityconfigstore_qti_default.te b/generic/vendor/common/vendor_hal_capabilityconfigstore_qti_default.te
index c56e2a5..871896e 100755
--- a/generic/vendor/common/vendor_hal_capabilityconfigstore_qti_default.te
+++ b/generic/vendor/common/vendor_hal_capabilityconfigstore_qti_default.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_capabilityconfigstore_qti_default, domain;
-hal_server_domain(hal_capabilityconfigstore_qti_default, hal_capabilityconfigstore_qti)
+type vendor_hal_capabilityconfigstore_qti_default, domain;
+hal_server_domain(vendor_hal_capabilityconfigstore_qti_default, vendor_hal_capabilityconfigstore_qti)
-type hal_capabilityconfigstore_qti_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_capabilityconfigstore_qti_default)
+type vendor_hal_capabilityconfigstore_qti_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_capabilityconfigstore_qti_default)
-allow hal_capabilityconfigstore_qti_default vendor_capabilityconfigstore_data_file:file rw_file_perms;
-allow hal_capabilityconfigstore_qti_default vendor_capabilityconfigstore_data_file:dir rw_dir_perms;
-userdebug_or_eng(`get_prop(hal_capabilityconfigstore_qti_default, vendor_cap_configstore_dbg_prop)')
+allow vendor_hal_capabilityconfigstore_qti_default vendor_capabilityconfigstore_data_file:file rw_file_perms;
+allow vendor_hal_capabilityconfigstore_qti_default vendor_capabilityconfigstore_data_file:dir rw_dir_perms;
+userdebug_or_eng(`get_prop(vendor_hal_capabilityconfigstore_qti_default, vendor_cap_configstore_dbg_prop)')
diff --git a/generic/vendor/common/vendor_hal_dataconnection_qti.te b/generic/vendor/common/vendor_hal_dataconnection_qti.te
index e8d245c..3c9a7f4 100644
--- a/generic/vendor/common/vendor_hal_dataconnection_qti.te
+++ b/generic/vendor/common/vendor_hal_dataconnection_qti.te
@@ -25,7 +25,7 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(hal_dataconnection_qti_client, hal_dataconnection_qti_server)
-binder_call(hal_dataconnection_qti_server, hal_dataconnection_qti_client)
+binder_call(vendor_hal_dataconnection_qti_client, vendor_hal_dataconnection_qti_server)
+binder_call(vendor_hal_dataconnection_qti_server, vendor_hal_dataconnection_qti_client)
-hal_attribute_hwservice(hal_dataconnection_qti, hal_dataconnection_hwservice)
+hal_attribute_hwservice(vendor_hal_dataconnection_qti, vendor_hal_dataconnection_hwservice)
diff --git a/generic/vendor/common/vendor_init.te b/generic/vendor/common/vendor_init.te
index 420b372..27dbe51 100644
--- a/generic/vendor/common/vendor_init.te
+++ b/generic/vendor/common/vendor_init.te
@@ -25,10 +25,10 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow vendor_init persist_block_device:{ blk_file lnk_file } relabelto;
+allow vendor_init vendor_persist_block_device:{ blk_file lnk_file } relabelto;
allow vendor_init unlabeled:dir { r_dir_perms setattr relabelfrom };
allow vendor_init unlabeled:file { r_file_perms setattr relabelfrom };
-allow vendor_init ipa_dev:chr_file w_file_perms;
+allow vendor_init vendor_ipa_dev:chr_file w_file_perms;
allow vendor_init proc:file write;
allow vendor_init self:capability sys_module;
@@ -41,7 +41,7 @@
allow vendor_init kmsg_device:chr_file write;
#Allow triggering IPA FWs loading
-allow vendor_init ipa_dev:chr_file write;
+allow vendor_init vendor_ipa_dev:chr_file write;
#For insmod to search module key for signature verification
allow vendor_init kernel:key search;
@@ -51,11 +51,11 @@
allow vendor_init configfs:file { rw_file_perms link };
allow vendor_init configfs:lnk_file create_file_perms;
-allow vendor_init sysfs_ssr:file write;
+allow vendor_init vendor_sysfs_ssr:file write;
allow vendor_init sysfs_android_usb:file rw_file_perms;
-allow vendor_init sysfs_slpi:file write;
+allow vendor_init vendor_sysfs_slpi:file write;
allow vendor_init vendor_file:system module_load;
@@ -80,14 +80,14 @@
#Access vendor gpu freq properties
set_prop(vendor_init, vendor_gpu_prop)
-#Access public_vendor_default_prop
-set_prop(vendor_init, public_vendor_default_prop)
+#Access vendor_public_vendor_default_prop
+set_prop(vendor_init, vendor_public_vendor_default_prop)
# Allow timezone to be overrided by vendor
set_prop(vendor_init, exported_system_prop)
# Access vendor sensor properties
-set_prop(vendor_init, sensors_prop)
+set_prop(vendor_init, vendor_sensors_prop)
#Access vendor bluetooth properties
set_prop(vendor_init, vendor_bluetooth_prop)
diff --git a/generic/vendor/common/vndservice.te b/generic/vendor/common/vndservice.te
index bd8b8d2..f28d972 100644
--- a/generic/vendor/common/vndservice.te
+++ b/generic/vendor/common/vndservice.te
@@ -24,6 +24,6 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qdisplay_service, vndservice_manager_type;
+type vendor_qdisplay_service, vndservice_manager_type;
type vendor_per_mgr_service, vndservice_manager_type;
-type qfeatenab_client_service, vndservice_manager_type;
+type vendor_qfeatenab_client_service, vndservice_manager_type;
diff --git a/generic/vendor/common/vndservice_contexts b/generic/vendor/common/vndservice_contexts
index 640b3dc..18672ba 100644
--- a/generic/vendor/common/vndservice_contexts
+++ b/generic/vendor/common/vndservice_contexts
@@ -24,6 +24,6 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-display.qservice u:object_r:qdisplay_service:s0
-featenab_client.service u:object_r:qfeatenab_client_service:s0
+display.qservice u:object_r:vendor_qdisplay_service:s0
+featenab_client.service u:object_r:vendor_qfeatenab_client_service:s0
vendor.qcom.PeripheralManager u:object_r:vendor_per_mgr_service:s0
diff --git a/generic/vendor/common/wcnss_service.te b/generic/vendor/common/wcnss_service.te
index 11ee915..16d404e 100644
--- a/generic/vendor/common/wcnss_service.te
+++ b/generic/vendor/common/wcnss_service.te
@@ -24,54 +24,54 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type wcnss_service, domain;
-type wcnss_service_exec, exec_type, vendor_file_type, file_type;
+type vendor_wcnss_service, domain;
+type vendor_wcnss_service_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(wcnss_service)
-net_domain(wcnss_service)
+init_daemon_domain(vendor_wcnss_service)
+net_domain(vendor_wcnss_service)
-vndbinder_use(wcnss_service)
-binder_call(wcnss_service, vendor_per_mgr)
+vndbinder_use(vendor_wcnss_service)
+binder_call(vendor_wcnss_service, vendor_per_mgr)
-allow wcnss_service vendor_per_mgr_service:service_manager find;
+allow vendor_wcnss_service vendor_per_mgr_service:service_manager find;
-allow wcnss_service vendor_shell_exec:file rx_file_perms;
-allow wcnss_service vendor_toolbox_exec:file rx_file_perms;
+allow vendor_wcnss_service vendor_shell_exec:file rx_file_perms;
+allow vendor_wcnss_service vendor_toolbox_exec:file rx_file_perms;
-allow wcnss_service wifi_vendor_data_file:dir create_dir_perms;
-allow wcnss_service wifi_vendor_data_file:file create_file_perms;
+allow vendor_wcnss_service vendor_wifi_vendor_data_file:dir create_dir_perms;
+allow vendor_wcnss_service vendor_wifi_vendor_data_file:file create_file_perms;
-allow wcnss_service proc_net:file w_file_perms;
+allow vendor_wcnss_service proc_net:file w_file_perms;
-allow wcnss_service self:{ socket qipcrtr_socket } create_socket_perms;
-allowxperm wcnss_service self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
-allowxperm wcnss_service self:udp_socket ioctl { SIOCIWFIRSTPRIV_05 SIOCSIFFLAGS };
+allow vendor_wcnss_service self:{ socket qipcrtr_socket } create_socket_perms;
+allowxperm vendor_wcnss_service self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+allowxperm vendor_wcnss_service self:udp_socket ioctl { SIOCIWFIRSTPRIV_05 SIOCSIFFLAGS };
-allow wcnss_service self:netlink_generic_socket create_socket_perms_no_ioctl;
-allow wcnss_service self:netlink_socket create_socket_perms_no_ioctl;
+allow vendor_wcnss_service self:netlink_generic_socket create_socket_perms_no_ioctl;
+allow vendor_wcnss_service self:netlink_socket create_socket_perms_no_ioctl;
-allow wcnss_service firmware_file:dir r_dir_perms;
-allow wcnss_service firmware_file:file r_file_perms;
+allow vendor_wcnss_service firmware_file:dir r_dir_perms;
+allow vendor_wcnss_service firmware_file:file r_file_perms;
-allow wcnss_service wpa_data_file:dir create_dir_perms;
-allow wcnss_service wpa_data_file:file create_file_perms;
+allow vendor_wcnss_service wpa_data_file:dir create_dir_perms;
+allow vendor_wcnss_service wpa_data_file:file create_file_perms;
-allow wcnss_service proc_net:file getattr;
+allow vendor_wcnss_service proc_net:file getattr;
-allow wcnss_service sysfs_data:file r_file_perms;
+allow vendor_wcnss_service vendor_sysfs_data:file r_file_perms;
# pkt logging for cnss_diag
userdebug_or_eng(`
- r_dir_file(wcnss_service, proc_wifi_dbg)
- r_dir_file(wcnss_service, sysfs_diag)
- allow wcnss_service sysfs_timestamp_switch:file r_file_perms;
+ r_dir_file(vendor_wcnss_service, vendor_proc_wifi_dbg)
+ r_dir_file(vendor_wcnss_service, vendor_sysfs_diag)
+ allow vendor_wcnss_service vendor_sysfs_timestamp_switch:file r_file_perms;
')
userdebug_or_eng(`
-allow wcnss_service wifi_vendor_log_data_file:dir create_dir_perms;
-allow wcnss_service wifi_vendor_log_data_file:file create_file_perms;
+allow vendor_wcnss_service vendor_wifi_vendor_log_data_file:dir create_dir_perms;
+allow vendor_wcnss_service vendor_wifi_vendor_log_data_file:file create_file_perms;
# This is needed for ptt_socket_app to write logs file collected to sdcard
-r_dir_file(wcnss_service, storage_file)
-r_dir_file(wcnss_service, mnt_user_file)
+r_dir_file(vendor_wcnss_service, storage_file)
+r_dir_file(vendor_wcnss_service, mnt_user_file)
')
diff --git a/generic/vendor/kona/file_contexts b/generic/vendor/kona/file_contexts
index cc0689c..7c2b295 100644
--- a/generic/vendor/kona/file_contexts
+++ b/generic/vendor/kona/file_contexts
@@ -35,72 +35,72 @@
/dev/block/platform/soc/1d84000.ufshc/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:vendor_rpmb_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs1 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs2 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs3 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdmddr u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs1 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs2 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs3 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdmddr u:object_r:vendor_efs_boot_dev:s0
# A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/core_nhlos_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/featenabler_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgqti_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:persist_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/core_nhlos_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/featenabler_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgqti_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/product_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/odm_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgoem_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgoem_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/super u:object_r:super_block_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
# Same process file
/vendor/lib(64)?/hw/gralloc\.kona\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/vulkan\.kona\.so u:object_r:same_process_hal_file:s0
# limits Partitions
-/dev/block/platform/soc/1d84000.ufshc/by-name/limits u:object_r:limits_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/limits-cdsp u:object_r:limits_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/limits u:object_r:vendor_limits_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/limits-cdsp u:object_r:vendor_limits_block_device:s0
diff --git a/generic/vendor/kona/genfs_contexts b/generic/vendor/kona/genfs_contexts
index 05a74fa..e2924a1 100644
--- a/generic/vendor/kona/genfs_contexts
+++ b/generic/vendor/kona/genfs_contexts
@@ -26,114 +26,114 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# subsys nodes
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys0/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_uc/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys8/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/aab0000.qcom,venus/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/abb0000.qcom,cvpss/subsys6/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys11/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/subsys10/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys5/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:sysfs_usb_controller:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys0/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_uc/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys8/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/aab0000.qcom,venus/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/abb0000.qcom,cvpss/subsys6/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys11/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/subsys10/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys5/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:vendor_sysfs_usb_controller:s0
#subsys nodes WLAN
-genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6390/subsys9/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys8/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys9/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys10/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys7/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6390/subsys9/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys8/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys9/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys10/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys7/name u:object_r:vendor_sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,wil6210/subsys12/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/esoc0 u:object_r:sysfs_esoc:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,wil6210/subsys12/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/esoc0 u:object_r:vendor_sysfs_esoc:s0
genfscon sysfs /devices/platform/vendor/vendor:bt_qca6390/extldo u:object_r:sysfs_bluetooth_writable:s0
genfscon sysfs /devices/platform/vendor/vendor:bt_qca6390/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0
# DCVS nodes
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-llcc-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npu-llcc-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npudsp-npu-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cpu4-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cpu7-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-qoslat/devfreq u:object_r:sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-llcc-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npu-llcc-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npudsp-npu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cpu4-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cpu7-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18590000.qcom,devfreq-l3/18590000.qcom,devfreq-l3:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-qoslat/devfreq u:object_r:vendor_sysfs_devfreq:s0
#mhi sysfs
-genfscon sysfs /devices/platform/soc/1c10000.qcom,pcie/pci0002:00/0002:00:00.0/0002:01:00.0/0306_02.01.00_QMI0 u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/platform/soc/1c10000.qcom,pcie/pci0002:00/0002:00:00.0/0002:01:00.0/0306_02.01.00_QMI1 u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_00.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_01.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_02.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_00.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_01.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_02.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_00.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_01.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_02.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_00.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_01.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_02.01.00/time_us u:object_r:sysfs_mhi:s0
+genfscon sysfs /devices/platform/soc/1c10000.qcom,pcie/pci0002:00/0002:00:00.0/0002:01:00.0/0306_02.01.00_QMI0 u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/platform/soc/1c10000.qcom,pcie/pci0002:00/0002:00:00.0/0002:01:00.0/0306_02.01.00_QMI1 u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_00.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_01.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_02.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_00.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_01.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_02.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_00.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_01.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_02.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_00.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_01.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_02.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
# Power supply device nodes
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/dc u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/main u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qpnp,fg/power_supply/bms u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/usb u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/884000.i2c/i2c-2/2-000c/884000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/884000.i2c/i2c-2/2-0010/884000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/dc u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qpnp,fg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/884000.i2c/i2c-2/2-000c/884000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/884000.i2c/i2c-2/2-0010/884000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:vendor_sysfs_usb_supply:s0
# LED device nodes
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/red u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/green u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/blue u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led1 u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led2 u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/red u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/green u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/blue u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led1 u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led2 u:object_r:vendor_sysfs_graphics:s0
#qdss sysfs-node
-genfscon sysfs /devices/platform/soc/6b05000.tmc/coresight-tmc-etf u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/soc:hwevent/coresight-hwevent u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6b0c000.csr/coresight-swao-csr u:object_r:sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6b05000.tmc/coresight-tmc-etf u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/soc:hwevent/coresight-hwevent u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6b0c000.csr/coresight-swao-csr u:object_r:vendor_sysfs_qdss_dev:s0
#fps sysfs-node
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
# USBPD device node
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:sysfs_usbpd_device:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:vendor_sysfs_usbpd_device:s0
#net sysfs
genfscon sysfs /devices/platform/soc/1c10000.qcom,pcie/pci0002:00/0002:00:00.0/0002:01:00.0/0306_02.01.00_IP_HW0/net u:object_r:sysfs_net:s0
#restart_level
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/subsys11/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys0/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_uc/subsys1/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6390/subsys9/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/subsys10/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,wil6210/subsys12/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys2/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys3/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/aab0000.qcom,venus/subsys4/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys5/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/abb0000.qcom,cvpss/subsys6/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys11/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys7/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/restart_level u:object_r:sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/subsys11/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys0/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_uc/subsys1/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6390/subsys9/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm0/subsys10/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,wil6210/subsys12/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys2/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys3/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/aab0000.qcom,venus/subsys4/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys5/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/abb0000.qcom,cvpss/subsys6/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys11/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys7/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
diff --git a/generic/vendor/kona/update_engine_common.te b/generic/vendor/kona/update_engine_common.te
index a220b73..315275b 100644
--- a/generic/vendor/kona/update_engine_common.te
+++ b/generic/vendor/kona/update_engine_common.te
@@ -28,11 +28,11 @@
# Allow update_engine and update_engine_sideload (recovery) read/write on the
# device-specific partitions it should update.
allow update_engine_common {
- custom_ab_block_device
- xbl_block_device
- uefi_block_device
- ssd_block_device
- modem_block_device
+ vendor_custom_ab_block_device
+ vendor_xbl_block_device
+ vendor_uefi_block_device
+ vendor_ssd_block_device
+ vendor_modem_block_device
recovery_block_device
}:blk_file rw_file_perms;
diff --git a/generic/vendor/lahaina/file_contexts b/generic/vendor/lahaina/file_contexts
index 66bfab1..a796e4e 100644
--- a/generic/vendor/lahaina/file_contexts
+++ b/generic/vendor/lahaina/file_contexts
@@ -35,72 +35,72 @@
/dev/block/platform/soc/1d84000.ufshc/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:rpmb_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:vendor_rpmb_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs1 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs2 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs3 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdmddr u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs1 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs2 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs3 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdmddr u:object_r:vendor_efs_boot_dev:s0
# A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/core_nhlos_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/featenabler_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgqti_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:persist_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/core_nhlos_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/featenabler_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgqti_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/product_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/odm_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgoem_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgoem_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/super u:object_r:super_block_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
# Same process file
/vendor/lib(64)?/hw/gralloc\.lahaina\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/vulkan\.lahaina\.so u:object_r:same_process_hal_file:s0
# limits Partitions
-/dev/block/platform/soc/1d84000.ufshc/by-name/limits u:object_r:limits_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/limits-cdsp u:object_r:limits_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/limits u:object_r:vendor_limits_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/limits-cdsp u:object_r:vendor_limits_block_device:s0
diff --git a/generic/vendor/lito/device.te b/generic/vendor/lito/device.te
index e7f1aff..aab907f 100644
--- a/generic/vendor/lito/device.te
+++ b/generic/vendor/lito/device.te
@@ -25,7 +25,7 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type logdump_partition, dev_type;
-type mba_debug_dev, dev_type;
-type dip_device, dev_type;
-type rawdump_block_device, dev_type;
+type vendor_logdump_partition, dev_type;
+type vendor_mba_debug_dev, dev_type;
+type vendor_dip_device, dev_type;
+type vendor_rawdump_block_device, dev_type;
diff --git a/generic/vendor/lito/file.te b/generic/vendor/lito/file.te
index e090843..72acff3 100644
--- a/generic/vendor/lito/file.te
+++ b/generic/vendor/lito/file.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sysfs_fps_attr, fs_type, sysfs_type;
+type vendor_sysfs_fps_attr, fs_type, sysfs_type;
diff --git a/generic/vendor/lito/file_contexts b/generic/vendor/lito/file_contexts
index 0ee339f..4146709 100644
--- a/generic/vendor/lito/file_contexts
+++ b/generic/vendor/lito/file_contexts
@@ -28,7 +28,7 @@
# Dev block nodes
#Primary storage device nodes
-/dev/block/mmcblk0rpmb u:object_r:rpmb_device:s0
+/dev/block/mmcblk0rpmb u:object_r:vendor_rpmb_device:s0
/dev/block/mmcblk0 u:object_r:root_block_device:s0
# UFS Devices
@@ -37,69 +37,69 @@
/dev/block/platform/soc/1d84000.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/odm u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:vendor_dip_device:s0
#rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:persist_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/odm_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/featenabler_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/core_nhlos_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/featenabler_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/core_nhlos_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/super u:object_r:super_block_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
# limits Partitions
-/dev/block/platform/soc/1d84000.ufshc/by-name/limits u:object_r:limits_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/limits-cdsp u:object_r:limits_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/limits u:object_r:vendor_limits_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/limits-cdsp u:object_r:vendor_limits_block_device:s0
##################################
# non-hlos mount points
@@ -107,73 +107,73 @@
/bt_firmware u:object_r:bt_firmware_file:s0
#eMMC Devices
-/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/vendor_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/odm_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/featenabler_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/core_nhlos_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/featenabler_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/core_nhlos_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
#non A/B
/dev/block/platform/soc/7c4000.sdhci/by-name/system u:object_r:system_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dip u:object_r:vendor_dip_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/storsec u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/persist u:object_r:persist_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/persist u:object_r:vendor_persist_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/super u:object_r:super_block_device:s0
#rawdump partition
-/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# limits Partitions
-/dev/block/platform/soc/7c4000.sdhci/by-name/limits u:object_r:limits_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/limits-cdsp u:object_r:limits_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/limits u:object_r:vendor_limits_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/limits-cdsp u:object_r:vendor_limits_block_device:s0
# FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:init-qti-fbe-sh_exec:s0
-/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:vendor_init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:vendor_qti_init_shell_exec:s0
##################################
# same process HAL libs
@@ -181,8 +181,8 @@
/vendor/lib(64)?/hw/vulkan\.lito\.so u:object_r:same_process_hal_file:s0
#FPC
-/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:sysfs_fps_attr:s0
-/sys/devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-03/200f000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/modalias u:object_r:sysfs_fps_attr:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-fpc u:object_r:hal_fingerprint_fpc_exec:s0
+/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:vendor_sysfs_fps_attr:s0
+/sys/devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-03/200f000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/modalias u:object_r:vendor_sysfs_fps_attr:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-fpc u:object_r:vendor_hal_fingerprint_fpc_exec:s0
-/sys/devices/platform/soc/780000.qfprom/qfprom0/feat_conf10 u:object_r:sysfs_qfprom:s0
+/sys/devices/platform/soc/780000.qfprom/qfprom0/feat_conf10 u:object_r:vendor_sysfs_qfprom:s0
diff --git a/generic/vendor/lito/genfs_contexts b/generic/vendor/lito/genfs_contexts
index 0d37cd5..ce5a544 100644
--- a/generic/vendor/lito/genfs_contexts
+++ b/generic/vendor/lito/genfs_contexts
@@ -26,70 +26,70 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Power supply device nodes
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/dc u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/main u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qpnp,qg/power_supply/bms u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/usb u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:sysfs_usbpd_device:s0
-genfscon sysfs /class/qcom-battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/98c000.i2c/i2c-2/2-000c/98c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/dc u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qpnp,qg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm7250b@2:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:vendor_sysfs_usbpd_device:s0
+genfscon sysfs /class/qcom-battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/98c000.i2c/i2c-2/2-000c/98c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
#qdss sysfs-node
-genfscon sysfs /devices/platform/soc/6b05000.tmc/coresight-tmc-etf u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/soc:hwevent/coresight-hwevent u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6b0c000.csr/coresight-swao-csr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/soc:dummy_source/coresight-modem-diag u:object_r:sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6b05000.tmc/coresight-tmc-etf u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/soc:hwevent/coresight-hwevent u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6b0c000.csr/coresight-swao-csr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/soc:dummy_source/coresight-modem-diag u:object_r:vendor_sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/3000000.qcom,lpass/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys5/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys6/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/3000000.qcom,lpass/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys5/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys6/name u:object_r:vendor_sysfs_ssr:s0
#It seem some change in the subsystem numbering adding the new list also
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys6/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys6/name u:object_r:vendor_sysfs_ssr:s0
# PMIC UI peripherals
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm8150@0:qcom,pm8150_rtc/rtc u:object_r:sysfs_rtc:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm7250b@3:qcom,vibrator@5300/leds/vibrator u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/red u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/green u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/blue u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/red u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/green u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/blue u:object_r:vendor_sysfs_graphics:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d300/leds u:object_r:sysfs_leds:s0
# DCVS nodes
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npudsp-npu-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cpu6-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cpu7-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu7-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npudsp-npu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cpu6-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cpu7-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/18321000.qcom,devfreq-l3/18321000.qcom,devfreq-l3:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu7-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
#net sysfs
genfscon sysfs /devices/platform/soc/18800000.qcom,icnss/net u:object_r:sysfs_net:s0
#fps sysfs-node
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
diff --git a/generic/vendor/lito/hal_fingerprint_fpc.te b/generic/vendor/lito/hal_fingerprint_fpc.te
index 967319e..5076262 100644
--- a/generic/vendor/lito/hal_fingerprint_fpc.te
+++ b/generic/vendor/lito/hal_fingerprint_fpc.te
@@ -25,11 +25,11 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_fingerprint_fpc, domain;
-hal_server_domain(hal_fingerprint_fpc, hal_fingerprint)
+type vendor_hal_fingerprint_fpc, domain;
+hal_server_domain(vendor_hal_fingerprint_fpc, hal_fingerprint)
-type hal_fingerprint_fpc_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_fingerprint_fpc)
+type vendor_hal_fingerprint_fpc_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_fingerprint_fpc)
-allow hal_fingerprint_fpc input_device:chr_file r_file_perms;
-allow hal_fingerprint_fpc tee_device:chr_file rw_file_perms;
+allow vendor_hal_fingerprint_fpc input_device:chr_file r_file_perms;
+allow vendor_hal_fingerprint_fpc tee_device:chr_file rw_file_perms;
diff --git a/generic/vendor/lito/init-qti-fbe-sh.te b/generic/vendor/lito/init-qti-fbe-sh.te
index a1cc3bd..ee17f17 100644
--- a/generic/vendor/lito/init-qti-fbe-sh.te
+++ b/generic/vendor/lito/init-qti-fbe-sh.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qti-fbe-sh, domain;
-type init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
+type vendor_init-qti-fbe-sh, domain;
+type vendor_init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(init-qti-fbe-sh)
+init_daemon_domain(vendor_init-qti-fbe-sh)
-allow init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
# execute toybox/toolbox
-allow init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
-get_prop(init-qti-fbe-sh, vendor_tee_listener_prop)
+allow vendor_init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
+get_prop(vendor_init-qti-fbe-sh, vendor_tee_listener_prop)
diff --git a/generic/vendor/lito/update_engine_common.te b/generic/vendor/lito/update_engine_common.te
index a220b73..315275b 100644
--- a/generic/vendor/lito/update_engine_common.te
+++ b/generic/vendor/lito/update_engine_common.te
@@ -28,11 +28,11 @@
# Allow update_engine and update_engine_sideload (recovery) read/write on the
# device-specific partitions it should update.
allow update_engine_common {
- custom_ab_block_device
- xbl_block_device
- uefi_block_device
- ssd_block_device
- modem_block_device
+ vendor_custom_ab_block_device
+ vendor_xbl_block_device
+ vendor_uefi_block_device
+ vendor_ssd_block_device
+ vendor_modem_block_device
recovery_block_device
}:blk_file rw_file_perms;
diff --git a/generic/vendor/msmnile/device.te b/generic/vendor/msmnile/device.te
index d981e49..8ad057c 100644
--- a/generic/vendor/msmnile/device.te
+++ b/generic/vendor/msmnile/device.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#logdump partition
-type logdump_partition, dev_type;
-type mba_debug_dev, dev_type;
-type dip_device, dev_type;
-type rawdump_block_device, dev_type;
+type vendor_logdump_partition, dev_type;
+type vendor_mba_debug_dev, dev_type;
+type vendor_dip_device, dev_type;
+type vendor_rawdump_block_device, dev_type;
diff --git a/generic/vendor/msmnile/file_contexts b/generic/vendor/msmnile/file_contexts
index e22b6d7..41e3d1f 100644
--- a/generic/vendor/msmnile/file_contexts
+++ b/generic/vendor/msmnile/file_contexts
@@ -35,70 +35,70 @@
/dev/block/platform/soc/1d84000.ufshc/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:dip_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs1 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs2 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs3 u:object_r:efs_boot_dev:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdmddr u:object_r:efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:vendor_dip_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs1 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs2 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdm1m9kefs3 u:object_r:vendor_efs_boot_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdmddr u:object_r:vendor_efs_boot_dev:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/super u:object_r:super_block_device:s0
#rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:persist_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/product_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/odm_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgoem_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/multiimgoem_[ab] u:object_r:vendor_custom_ab_block_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
# Same process file
/vendor/lib(64)?/hw/gralloc\.msmnile\.so u:object_r:same_process_hal_file:s0
diff --git a/generic/vendor/msmnile/genfs_contexts b/generic/vendor/msmnile/genfs_contexts
index 0d06269..ef3083f 100644
--- a/generic/vendor/msmnile/genfs_contexts
+++ b/generic/vendor/msmnile/genfs_contexts
@@ -25,101 +25,101 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/dc u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/main u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/usb u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qpnp,fg/power_supply/bms u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/890000.i2c/i2c-0/0-0008/890000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/890000.i2c/i2c-0/0-000c/890000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/890000.i2c/i2c-0/0-0010/890000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /class/qcom-battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /class/charge_pump u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/red u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/green u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/blue u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led1 u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led2 u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu7-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:sysfs_usb_controller:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/dc u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qpnp,fg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/890000.i2c/i2c-0/0-0008/890000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/890000.i2c/i2c-0/0-000c/890000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/890000.i2c/i2c-0/0-0010/890000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /class/qcom-battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /class/charge_pump u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/red u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/green u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm8150l@5:qcom,leds@d000/leds/blue u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led1 u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pm8150b@3:qcom,leds@d000/leds/hr_led2 u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu7-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:vendor_sysfs_usb_controller:s0
#qdss sysfs-node
-genfscon sysfs /devices/platform/soc/6047000.tmc/coresight-tmc-etf u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/91866f0.hwevent/coresight-hwevent u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6b0e000.csr/coresight-swao-csr u:object_r:sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6047000.tmc/coresight-tmc-etf u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/91866f0.hwevent/coresight-hwevent u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6b0e000.csr/coresight-swao-csr u:object_r:vendor_sysfs_qdss_dev:s0
#fps sysfs-node
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
# subsys nodes
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys5/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys6/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys7/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,wil6210/subsys9/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_uc/subsys9/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/subsys9/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/subsys10/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys5/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys6/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys7/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,wil6210/subsys9/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_uc/subsys9/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/subsys9/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/subsys10/name u:object_r:vendor_sysfs_ssr:s0
genfscon sysfs /devices/platform/soc/soc:bt_qca6174/extldo u:object_r:sysfs_bluetooth_writable:s0
genfscon sysfs /devices/platform/soc/soc:bt_qca6174/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/esoc0 u:object_r:sysfs_esoc:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/esoc0 u:object_r:vendor_sysfs_esoc:s0
#restart level
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys1/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys2/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys3/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys5/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys6/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys7/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/restart_level u:object_r:sysfs_ssr_toggle:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/subsys10/restart_level u:object_r:sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/17300000.qcom,lpass/subsys1/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/5c00000.qcom,ssc/subsys2/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/188101c.qcom,spss/subsys3/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys5/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys6/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys7/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys8/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdm3/subsys10/restart_level u:object_r:vendor_sysfs_ssr_toggle:s0
#hvdcp
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:sysfs_usbpd_device:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:vendor_sysfs_usbpd_device:s0
#mhi sysfs
-genfscon sysfs /bus/mhi/devices/0304_00.01.00_QMI1/mhi_uci u:object_r:sysfs_mhi:s0
-genfscon sysfs /bus/mhi/devices/0306_00.01.00_QMI1/mhi_uci u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/platform/soc/1c08000.qcom,pcie/pci0001:00/0001:00:00.0/0001:01:00.0/0306_01.01.00_QMI0 u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/platform/soc/1c08000.qcom,pcie/pci0001:00/0001:00:00.0/0001:01:00.0/0306_01.01.00_QMI1 u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_00.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_01.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_02.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_00.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_01.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_02.01.00/time u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_00.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_01.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/0306_02.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_00.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_01.01.00/time_us u:object_r:sysfs_mhi:s0
-genfscon sysfs /devices/1101_02.01.00/time_us u:object_r:sysfs_mhi:s0
+genfscon sysfs /bus/mhi/devices/0304_00.01.00_QMI1/mhi_uci u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /bus/mhi/devices/0306_00.01.00_QMI1/mhi_uci u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/platform/soc/1c08000.qcom,pcie/pci0001:00/0001:00:00.0/0001:01:00.0/0306_01.01.00_QMI0 u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/platform/soc/1c08000.qcom,pcie/pci0001:00/0001:00:00.0/0001:01:00.0/0306_01.01.00_QMI1 u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_00.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_01.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_02.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_00.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_01.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_02.01.00/time u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_00.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_01.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/0306_02.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_00.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_01.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
+genfscon sysfs /devices/1101_02.01.00/time_us u:object_r:vendor_sysfs_mhi:s0
#net sysfs
genfscon sysfs /devices/platform/soc/1c08000.qcom,pcie/pci0001:00/0001:00:00.0/0001:01:00.0/0306_01.01.00_IP_HW0/net u:object_r:sysfs_net:s0
diff --git a/generic/vendor/msmnile/update_engine_common.te b/generic/vendor/msmnile/update_engine_common.te
index e0c9bf9..e9d003d 100644
--- a/generic/vendor/msmnile/update_engine_common.te
+++ b/generic/vendor/msmnile/update_engine_common.te
@@ -28,11 +28,11 @@
# Allow update_engine and update_engine_sideload (recovery) read/write on the
# device-specific partitions it should update.
allow update_engine_common {
- custom_ab_block_device
- xbl_block_device
- uefi_block_device
- ssd_block_device
- modem_block_device
+ vendor_custom_ab_block_device
+ vendor_xbl_block_device
+ vendor_uefi_block_device
+ vendor_ssd_block_device
+ vendor_modem_block_device
recovery_block_device
}:blk_file rw_file_perms;
diff --git a/generic/vendor/sdm845/file_contexts b/generic/vendor/sdm845/file_contexts
index 911b64c..e85a993 100644
--- a/generic/vendor/sdm845/file_contexts
+++ b/generic/vendor/sdm845/file_contexts
@@ -28,25 +28,25 @@
# Dev block nodes
# dev block nodes
-/dev/block/platform/soc/1d84000\.ufshc/by-name/abl_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/apdp_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib64_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/dtbo_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/devcfg_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/hosd_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/hyp_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/keymaster_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/lockbooter_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/laf_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/pmic_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/trusty_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/tz_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/vbmeta_[ab] u:object_r:ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/abl_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/apdp_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/dtbo_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/devcfg_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/hosd_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/hyp_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/keymaster_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/lockbooter_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/laf_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/msadp_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/pmic_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/rpm_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/storsec_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/trusty_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/tz_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
@@ -56,46 +56,46 @@
/dev/block/platform/soc/1d84000\.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst[12] u:object_r:modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst[12] u:object_r:vendor_modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:persist_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/ramdump u:object_r:ramdump_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ramdump u:object_r:vendor_ramdump_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ImageFv_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/ImageFv_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_product_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/super u:object_r:super_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
/vendor/lib(64)?/hw/gralloc\.sdm845\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/vulkan\.sdm845\.so u:object_r:same_process_hal_file:s0
-/(vendor|system/vendor)/bin/hdcp_srm u:object_r:hdcp_srm_exec:s0
+/(vendor|system/vendor)/bin/hdcp_srm u:object_r:vendor_hdcp_srm_exec:s0
# FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:vendor_init-qti-fbe-sh_exec:s0
-/sys/devices/platform/soc/17d41000.qcom,cpucc/17d41000.qcom,cpucc:qcom,wil6210/subsys8/name u:object_r:sysfs_ssr:s0
+/sys/devices/platform/soc/17d41000.qcom,cpucc/17d41000.qcom,cpucc:qcom,wil6210/subsys8/name u:object_r:vendor_sysfs_ssr:s0
diff --git a/generic/vendor/test/diag_test.te b/generic/vendor/test/diag_test.te
index 9aebe86..a9accf6 100644
--- a/generic/vendor/test/diag_test.te
+++ b/generic/vendor/test/diag_test.te
@@ -25,12 +25,12 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type diagdciclient_exec, exec_type, vendor_file_type, file_type;
+type vendor_diagdciclient_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
- type diag_test, domain;
- domain_auto_trans(shell, diagdciclient_exec, diag_test)
- #domain_auto_trans(adbd, diagdciclient_exec, diag_test)
- allow diag_test devpts:chr_file getattr;
- allow diag_test devpts:chr_file {ioctl read write open};
+ type vendor_diag_test, domain;
+ domain_auto_trans(shell, vendor_diagdciclient_exec, vendor_diag_test)
+ #domain_auto_trans(adbd, vendor_diagdciclient_exec, vendor_diag_test)
+ allow vendor_diag_test devpts:chr_file getattr;
+ allow vendor_diag_test devpts:chr_file {ioctl read write open};
')
diff --git a/generic/vendor/test/domain.te b/generic/vendor/test/domain.te
index fedc00f..ee8e842 100644
--- a/generic/vendor/test/domain.te
+++ b/generic/vendor/test/domain.te
@@ -36,8 +36,8 @@
} vendor_gles_data_file:file *;
#allow all gpu clients to access configuration settings
userdebug_or_eng(`
-allow domain sysfs_kgsl:dir search;
-r_dir_file({domain - isolated_app}, sysfs_kgsl_snapshot);
+allow domain vendor_sysfs_kgsl:dir search;
+r_dir_file({domain - isolated_app}, vendor_sysfs_kgsl_snapshot);
allow domain coredump_file:dir create_dir_perms;
allow domain coredump_file:file create_file_perms;
allow domain coredump_file:dir rw_dir_perms;
diff --git a/generic/vendor/test/fidotest.te b/generic/vendor/test/fidotest.te
index 1d1e96b..cfd617a 100644
--- a/generic/vendor/test/fidotest.te
+++ b/generic/vendor/test/fidotest.te
@@ -25,29 +25,29 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type fidotest, domain;
-type fidotest_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(fidotest)
+type vendor_fidotest, domain;
+type vendor_fidotest_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_fidotest)
userdebug_or_eng(`
#Allow apps to interact with fido test daemons
- binder_call(fidotest, platform_app)
- binder_call(platform_app, fidotest)
- binder_call(fidotest, system_app)
- binder_call(system_app, fidotest)
+ binder_call(vendor_fidotest, platform_app)
+ binder_call(platform_app, vendor_fidotest)
+ binder_call(vendor_fidotest, system_app)
+ binder_call(system_app, vendor_fidotest)
#Allow fido test daemons to be registered with service manager
#TODO(b/142498985): Review sepolicy neverallow violation
- #allow fidotest fidotest_service:service_manager add;
+ #allow vendor_fidotest fidotest_service:service_manager add;
# Allow communication with init over property server
- unix_socket_connect(fidotest, property, init);
+ unix_socket_connect(vendor_fidotest, property, init);
# Allow access to tee device
- allow fidotest tee_device:chr_file rw_file_perms;
+ allow vendor_fidotest tee_device:chr_file rw_file_perms;
# Allow access to firmware
- allow fidotest firmware_file:dir r_dir_perms;
- allow fidotest firmware_file:file r_file_perms;
+ allow vendor_fidotest firmware_file:dir r_dir_perms;
+ allow vendor_fidotest firmware_file:file r_file_perms;
')
diff --git a/generic/vendor/test/file.te b/generic/vendor/test/file.te
index 5e08fbb..5646993 100644
--- a/generic/vendor/test/file.te
+++ b/generic/vendor/test/file.te
@@ -26,15 +26,15 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# kgsl snapshot file type for sysfs access
-type sysfs_kgsl_snapshot, sysfs_type, fs_type;
+type vendor_sysfs_kgsl_snapshot, sysfs_type, fs_type;
# path to debugfs. use this only in debug builds
-type qti_debugfs, fs_type, debugfs_type;
+type vendor_qti_debugfs, fs_type, debugfs_type;
# path to display related debugfs. use this only in debug builds
-type qti_display_debugfs, fs_type, debugfs_type;
+type vendor_qti_display_debugfs, fs_type, debugfs_type;
# sensors data file type for script access by test apps
-type sensors_data_file, file_type, data_file_type, core_data_file_type;
+type vendor_sensors_data_file, file_type, data_file_type, core_data_file_type;
type vendor_gles_data_file, file_type, data_file_type;
diff --git a/generic/vendor/test/file_contexts b/generic/vendor/test/file_contexts
index 8298040..dcf4d27 100644
--- a/generic/vendor/test/file_contexts
+++ b/generic/vendor/test/file_contexts
@@ -25,68 +25,68 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-/(vendor|system/vendor)/bin/kernel-tests/smd.* u:object_r:smd_test_exec:s0
-/(vendor|system/vendor)/bin/qmi-framework-tests/qmi_ping.* u:object_r:qmi_ping_exec:s0
-/(vendor|system/vendor)/bin/qmi-framework-tests/qmi_test.* u:object_r:qmi_test_service_exec:s0
+/(vendor|system/vendor)/bin/kernel-tests/smd.* u:object_r:vendor_smd_test_exec:s0
+/(vendor|system/vendor)/bin/qmi-framework-tests/qmi_ping.* u:object_r:vendor_qmi_ping_exec:s0
+/(vendor|system/vendor)/bin/qmi-framework-tests/qmi_test.* u:object_r:vendor_qmi_test_service_exec:s0
-/(vendor|system/vendor)/bin/diag_dci_client u:object_r:diagdciclient_exec:s0
+/(vendor|system/vendor)/bin/diag_dci_client u:object_r:vendor_diagdciclient_exec:s0
-/(vendor|system/vendor)/bin/ptt_socket_app u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/athdiag u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/cld-fwlog-netlink u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/cld-fwlog-record u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/cld-fwlog-parser u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/cnss_diag u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/iwpriv u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/iwconfig u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/iw u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/iwlist u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/iwss_test u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/pktlogconf u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/iperf u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/mboxping u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/sigma_dut u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/pktlog u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/hal_proxy_daemon u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/Wifilogger_app u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/hs20-osu-client u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/ndc u:object_r:wcnss_service_exec:s0
-/(vendor|system/vendor)/bin/playreadygtest(.*) u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/oem(.*)test u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/widevine(.*) u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/qseecom_sample_client u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/isdbtmmtest u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/secure_ui_sample_client u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/qseecom_security_test u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/qfipsverify u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/qseecom_assurance_test u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/drm_generic_prov_test u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/ParserApp u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/StoreKeybox u:object_r:sectest_exec:s0
-/(vendor|system/vendor)/bin/InstallKeybox u:object_r:sectest_exec:s0
+/(vendor|system/vendor)/bin/ptt_socket_app u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/athdiag u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/cld-fwlog-netlink u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/cld-fwlog-record u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/cld-fwlog-parser u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/cnss_diag u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/iwpriv u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/iwconfig u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/iw u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/iwlist u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/iwss_test u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/pktlogconf u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/iperf u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/mboxping u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/sigma_dut u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/pktlog u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/hal_proxy_daemon u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/Wifilogger_app u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/hs20-osu-client u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/ndc u:object_r:vendor_wcnss_service_exec:s0
+/(vendor|system/vendor)/bin/playreadygtest(.*) u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/oem(.*)test u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/widevine(.*) u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/qseecom_sample_client u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/isdbtmmtest u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/secure_ui_sample_client u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/qseecom_security_test u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/qfipsverify u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/qseecom_assurance_test u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/drm_generic_prov_test u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/ParserApp u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/StoreKeybox u:object_r:vendor_sectest_exec:s0
+/(vendor|system/vendor)/bin/InstallKeybox u:object_r:vendor_sectest_exec:s0
#Authentication and FIDO
-/(vendor|system/vendor)/bin/sampleauthdaemon u:object_r:fidotest_exec:s0
-/(vendor|system/vendor)/bin/qseeproxysampledaemon u:object_r:qseeproxysample_exec:s0
+/(vendor|system/vendor)/bin/sampleauthdaemon u:object_r:vendor_fidotest_exec:s0
+/(vendor|system/vendor)/bin/qseeproxysampledaemon u:object_r:vendor_qseeproxysample_exec:s0
#### Context for location test binaries
-/(vendor|system/vendor)/bin/lowi_test u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/test-version u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/test-pos-tx u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/xtwifi-upload-test u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/test-fake-ap u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/test-fdal u:object_r:location_exec:s0
+/(vendor|system/vendor)/bin/lowi_test u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/test-version u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/test-pos-tx u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/xtwifi-upload-test u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/test-fake-ap u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/test-fdal u:object_r:vendor_location_exec:s0
-/(vendor|system/vendor)/bin/sns.* u:object_r:sensors_test_exec:s0
+/(vendor|system/vendor)/bin/sns.* u:object_r:vendor_sensors_test_exec:s0
# Sensors scripts for test app
-/data/sensors/scripts(/.*)? u:object_r:sensors_data_file:s0
+/data/sensors/scripts(/.*)? u:object_r:vendor_sensors_data_file:s0
#for testscripts support
/(vendor|system/vendor)/bin/init\.qcom\.vendor\.testscripts\.sh u:object_r:vendor-qti-testscripts_exec:s0
#TODO: coredump_file need have a attribute of data_file_type and
# is going to show compile time issue need to fix this
#Context for GPU applications
#/data/vendor/gpu(/.*)? u:object_r:coredump_file:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0/snapshot(/.*)? u:object_r:sysfs_kgsl_snapshot:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0/snapshot(/.*)? u:object_r:vendor_sysfs_kgsl_snapshot:s0
# Console via JTAG - debug only
/dev/hvc0 u:object_r:console_device:s0
diff --git a/generic/vendor/test/genfs_contexts b/generic/vendor/test/genfs_contexts
index 853adfa..a33d24c 100644
--- a/generic/vendor/test/genfs_contexts
+++ b/generic/vendor/test/genfs_contexts
@@ -25,7 +25,7 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-genfscon debugfs /dri/0/debug/dump u:object_r:qti_display_debugfs:s0
-genfscon debugfs /dri/0/debug/recovery_reg u:object_r:qti_display_debugfs:s0
-genfscon debugfs /dri/0/debug/recovery_dbgbus u:object_r:qti_display_debugfs:s0
-genfscon debugfs /dri/0/debug/recovery_vbif_dbgbus u:object_r:qti_display_debugfs:s0
+genfscon debugfs /dri/0/debug/dump u:object_r:vendor_qti_display_debugfs:s0
+genfscon debugfs /dri/0/debug/recovery_reg u:object_r:vendor_qti_display_debugfs:s0
+genfscon debugfs /dri/0/debug/recovery_dbgbus u:object_r:vendor_qti_display_debugfs:s0
+genfscon debugfs /dri/0/debug/recovery_vbif_dbgbus u:object_r:vendor_qti_display_debugfs:s0
diff --git a/generic/vendor/test/init_shell.te b/generic/vendor/test/init_shell.te
index 1f10220..4f55900 100644
--- a/generic/vendor/test/init_shell.te
+++ b/generic/vendor/test/init_shell.te
@@ -26,6 +26,6 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
userdebug_or_eng(`
- allow qti_init_shell fuse:dir create_dir_perms;
- allow qti_init_shell fuse:file create_file_perms;
+ allow vendor_qti_init_shell fuse:dir create_dir_perms;
+ allow vendor_qti_init_shell fuse:file create_file_perms;
')
diff --git a/generic/vendor/test/pdt_app.te b/generic/vendor/test/pdt_app.te
index 3476a90..d785503 100644
--- a/generic/vendor/test/pdt_app.te
+++ b/generic/vendor/test/pdt_app.te
@@ -29,12 +29,12 @@
# userdebug_or_eng macro
userdebug_or_eng(`
-type pdt_app, domain;
-app_domain(pdt_app);
-net_domain(pdt_app)
-permissive pdt_app;
-# r_dir_file(pdt_app, domain)
-dontaudit pdt_app service_manager_type:service_manager *;
-dontaudit pdt_app hwservice_manager_type:hwservice_manager *;
-dontaudit pdt_app file_type:dir_file_class_set *;
+type vendor_pdt_app, domain;
+app_domain(vendor_pdt_app);
+net_domain(vendor_pdt_app)
+permissive vendor_pdt_app;
+# r_dir_file(vendor_pdt_app, domain)
+dontaudit vendor_pdt_app service_manager_type:service_manager *;
+dontaudit vendor_pdt_app hwservice_manager_type:hwservice_manager *;
+dontaudit vendor_pdt_app file_type:dir_file_class_set *;
')
diff --git a/generic/vendor/test/priv_app.te b/generic/vendor/test/priv_app.te
index 5e571b1..2fb6f2b 100644
--- a/generic/vendor/test/priv_app.te
+++ b/generic/vendor/test/priv_app.te
@@ -27,8 +27,8 @@
#allow priv_app clients to access configuration settings
userdebug_or_eng(`
-allow priv_app sysfs_kgsl:dir search;
-r_dir_file(priv_app, sysfs_kgsl_snapshot);
+allow priv_app vendor_sysfs_kgsl:dir search;
+r_dir_file(priv_app, vendor_sysfs_kgsl_snapshot);
r_dir_file(priv_app, vendor_gles_data_file);
allow priv_app vendor_gles_data_file:dir rw_dir_perms;
allow priv_app vendor_gles_data_file:file rw_file_perms;
diff --git a/generic/vendor/test/property.te b/generic/vendor/test/property.te
index b74c92a..d6dddc3 100644
--- a/generic/vendor/test/property.te
+++ b/generic/vendor/test/property.te
@@ -24,7 +24,7 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sensors_dbg_prop, property_type;
+type vendor_sensors_dbg_prop, property_type;
#WiFi Display
-type wfd_vendor_debug_prop, property_type;
+type vendor_wfd_vendor_debug_prop, property_type;
diff --git a/generic/vendor/test/property_contexts b/generic/vendor/test/property_contexts
index a9703ce..612dbfb 100644
--- a/generic/vendor/test/property_contexts
+++ b/generic/vendor/test/property_contexts
@@ -24,12 +24,12 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-persist.vendor.debug.sensors. u:object_r:sensors_dbg_prop:s0
+persist.vendor.debug.sensors. u:object_r:vendor_sensors_dbg_prop:s0
#Wifi Display
-persist.vendor.debug.mux. u:object_r:wfd_vendor_debug_prop:s0
-persist.vendor.debug.rtp. u:object_r:wfd_vendor_debug_prop:s0
-persist.vendor.debug.wfd. u:object_r:wfd_vendor_debug_prop:s0
+persist.vendor.debug.mux. u:object_r:vendor_wfd_vendor_debug_prop:s0
+persist.vendor.debug.rtp. u:object_r:vendor_wfd_vendor_debug_prop:s0
+persist.vendor.debug.wfd. u:object_r:vendor_wfd_vendor_debug_prop:s0
#CNE IWLAN Logging
-persist.vendor.iwlan.logging.logcat u:object_r:cnd_prop:s0
+persist.vendor.iwlan.logging.logcat u:object_r:vendor_cnd_prop:s0
diff --git a/generic/vendor/test/qmi_ping.te b/generic/vendor/test/qmi_ping.te
index 298e3ec..7fc4a27 100644
--- a/generic/vendor/test/qmi_ping.te
+++ b/generic/vendor/test/qmi_ping.te
@@ -26,18 +26,18 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#must be defined for file_contexts
-type qmi_ping_exec, exec_type, vendor_file_type, file_type;
+type vendor_qmi_ping_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
- type qmi_ping, domain;
- domain_auto_trans(shell, qmi_ping_exec, qmi_ping)
+ type vendor_qmi_ping, domain;
+ domain_auto_trans(shell, vendor_qmi_ping_exec, vendor_qmi_ping)
#test launched from pseudo terminal, so output goes there
- allow qmi_ping devpts:chr_file {read write ioctl getattr};
+ allow vendor_qmi_ping devpts:chr_file {read write ioctl getattr};
#enable accessing the path where qmuxds named sockets are present
#to interface with qmuxd through unix sockets
#to use socket interface to ipc router
- allow qmi_ping qmi_ping:socket {create bind read write setopt};
+ allow vendor_qmi_ping vendor_qmi_ping:socket {create bind read write setopt};
#enable running test as root user => privileged process
#enable privileged processes to bypass permission checks
- allow qmi_ping qmi_ping:capability {setgid setuid fsetid};
+ allow vendor_qmi_ping vendor_qmi_ping:capability {setgid setuid fsetid};
')
diff --git a/generic/vendor/test/qmi_test_service.te b/generic/vendor/test/qmi_test_service.te
index b053081..75362db 100644
--- a/generic/vendor/test/qmi_test_service.te
+++ b/generic/vendor/test/qmi_test_service.te
@@ -26,21 +26,21 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#must be defined for file_contexts
-type qmi_test_service_exec, exec_type, vendor_file_type, file_type;
+type vendor_qmi_test_service_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
- type qmi_test_service, domain;
- domain_auto_trans(shell, qmi_test_service_exec, qmi_test_service)
- #domain_auto_trans(adbd, qmi_test_service_exec, qmi_test_service)
+ type vendor_qmi_test_service, domain;
+ domain_auto_trans(shell, vendor_qmi_test_service_exec, vendor_qmi_test_service)
+ #domain_auto_trans(adbd, vendor_qmi_test_service_exec, vendor_qmi_test_service)
#enable access to loader in 64 bit system
- allow qmi_test_service shell:fd use;
+ allow vendor_qmi_test_service shell:fd use;
#test is launched from pseudo terminal so output goes there
- allow qmi_test_service devpts:chr_file {read write getattr ioctl};
+ allow vendor_qmi_test_service devpts:chr_file {read write getattr ioctl};
#enable accessing the path where qmuxds named sockets are present
#to interface with qmuxd through unix sockets
#to access ipc router socket
- allow qmi_test_service qmi_test_service:socket {create bind read write setopt};
+ allow vendor_qmi_test_service vendor_qmi_test_service:socket {create bind read write setopt};
#enable running test as root user => privileged process
#enable privileged processes to bypass permission checks
- allow qmi_test_service qmi_test_service:capability {setgid setuid fsetid};
+ allow vendor_qmi_test_service vendor_qmi_test_service:capability {setgid setuid fsetid};
')
diff --git a/generic/vendor/test/qseeproxysample.te b/generic/vendor/test/qseeproxysample.te
index cb43dd1..fa1b461 100644
--- a/generic/vendor/test/qseeproxysample.te
+++ b/generic/vendor/test/qseeproxysample.te
@@ -25,26 +25,26 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qseeproxysample, domain;
-type qseeproxysample_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(qseeproxysample)
+type vendor_qseeproxysample, domain;
+type vendor_qseeproxysample_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_qseeproxysample)
userdebug_or_eng(`
#Allow test daemon to be registered with service manager
#TODO(b/142498985): Review sepolicy neverallow violation
- #allow qseeproxysample qseeproxysample_service:service_manager add;
+ #allow vendor_qseeproxysample qseeproxysample_service:service_manager add;
#Allow test daemon to use system_server via binder to check caller identity
- binder_call(qseeproxysample, system_server)
+ binder_call(vendor_qseeproxysample, system_server)
# Allow communication with init over property server
- unix_socket_connect(qseeproxysample, property, init);
+ unix_socket_connect(vendor_qseeproxysample, property, init);
# Allow access to tee device
- allow qseeproxysample tee_device:chr_file rw_file_perms;
+ allow vendor_qseeproxysample tee_device:chr_file rw_file_perms;
# Allow access to firmware
- allow qseeproxysample firmware_file:dir r_dir_perms;
- allow qseeproxysample firmware_file:file r_file_perms;
+ allow vendor_qseeproxysample firmware_file:dir r_dir_perms;
+ allow vendor_qseeproxysample firmware_file:file r_file_perms;
')
diff --git a/generic/vendor/test/qsta_app.te b/generic/vendor/test/qsta_app.te
index d6ed423..891b049 100644
--- a/generic/vendor/test/qsta_app.te
+++ b/generic/vendor/test/qsta_app.te
@@ -25,17 +25,17 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-## qsta_app
+## vendor_qsta_app
##
-## This file defines the permissions that qsta_apps can carry
+## This file defines the permissions that vendor_qsta_apps can carry
-type qsta_app, domain;
-app_domain(qsta_app)
-hal_client_domain(qsta_app, hal_perf)
-r_dir_file(qsta_app, persist_sensors_file)
-get_prop(qsta_app, sensors_prop)
+type vendor_qsta_app, domain;
+app_domain(vendor_qsta_app)
+hal_client_domain(vendor_qsta_app, vendor_hal_perf)
+r_dir_file(vendor_qsta_app, vendor_persist_sensors_file)
+get_prop(vendor_qsta_app, vendor_sensors_prop)
-allow qsta_app {
+allow vendor_qsta_app {
app_api_service
surfaceflinger_service
audioserver_service
@@ -43,13 +43,13 @@
mediametrics_service
}:service_manager find;
-dontaudit qsta_app gpu_service:service_manager find;
-dontaudit qsta_app hal_qspmhal_hwservice:hwservice_manager find;
+dontaudit vendor_qsta_app gpu_service:service_manager find;
+dontaudit vendor_qsta_app vendor_hal_qspmhal_hwservice:hwservice_manager find;
userdebug_or_eng(`
- allow qsta_app diag_device:chr_file { read write open ioctl };
+ allow vendor_qsta_app vendor_diag_device:chr_file { read write open ioctl };
')
-allow qsta_app mnt_vendor_file:dir r_dir_perms;
-allow qsta_app system_app_data_file:dir create_dir_perms;
-allow qsta_app system_app_data_file:file create_file_perms;
+allow vendor_qsta_app mnt_vendor_file:dir r_dir_perms;
+allow vendor_qsta_app system_app_data_file:dir create_dir_perms;
+allow vendor_qsta_app system_app_data_file:file create_file_perms;
diff --git a/generic/vendor/test/seapp_contexts b/generic/vendor/test/seapp_contexts
index 7d594aa..0bd9601 100644
--- a/generic/vendor/test/seapp_contexts
+++ b/generic/vendor/test/seapp_contexts
@@ -26,14 +26,14 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#Add new domain for pdt apps
-user=system seinfo=platform name=.pdtapps domain=pdt_app type=system_app_data_file
+user=system seinfo=platform name=.pdtapps domain=vendor_pdt_app type=system_app_data_file
#Add new domain for usta app
-user=system seinfo=platform name=com.qualcomm.qti.usta domain=usta_app type=system_app_data_file
+user=system seinfo=platform name=com.qualcomm.qti.usta domain=vendor_usta_app type=system_app_data_file
#Add new domain for qsta app
-user=_app seinfo=platform name=com.qualcomm.qti.sensors.qsensortest domain=qsta_app type=app_data_file
+user=_app seinfo=platform name=com.qualcomm.qti.sensors.qsensortest domain=vendor_qsta_app type=app_data_file
#Add new domain for ustaservice app
# Needed for USTA test app
-user=system seinfo=platform name=com.qualcomm.qti.ustaservice domain=ustaservice_app type=system_app_data_file
+user=system seinfo=platform name=com.qualcomm.qti.ustaservice domain=vendor_ustaservice_app type=system_app_data_file
diff --git a/generic/vendor/test/sectest.te b/generic/vendor/test/sectest.te
index a684b81..ccfbaa4 100644
--- a/generic/vendor/test/sectest.te
+++ b/generic/vendor/test/sectest.te
@@ -25,15 +25,15 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sectest, domain;
-type sectest_exec, exec_type, vendor_file_type, file_type;
+type vendor_sectest, domain;
+type vendor_sectest_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
- init_daemon_domain(sectest)
- # allow sectest access to drm related paths
- allow sectest mnt_vendor_file:dir r_dir_perms;
- r_dir_file(sectest, persist_data_file)
+ init_daemon_domain(vendor_sectest)
+ # allow vendor_sectest access to drm related paths
+ allow vendor_sectest mnt_vendor_file:dir r_dir_perms;
+ r_dir_file(vendor_sectest, vendor_persist_data_file)
# Write to drm related pieces of persist partition
- allow sectest persist_drm_file:dir create_dir_perms;
- allow sectest persist_drm_file:file create_file_perms;
- allow sectest tee_device:chr_file rw_file_perms;
+ allow vendor_sectest vendor_persist_drm_file:dir create_dir_perms;
+ allow vendor_sectest vendor_persist_drm_file:file create_file_perms;
+ allow vendor_sectest tee_device:chr_file rw_file_perms;
')
diff --git a/generic/vendor/test/sensors_test.te b/generic/vendor/test/sensors_test.te
index 1ba68cf..4f5bd23 100644
--- a/generic/vendor/test/sensors_test.te
+++ b/generic/vendor/test/sensors_test.te
@@ -26,17 +26,17 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Policy for sensor test binaries
-type sensors_test_exec, exec_type, vendor_file_type, file_type;
+type vendor_sensors_test_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
- type sensors_test, domain;
+ type vendor_sensors_test, domain;
- domain_auto_trans(shell, sensors_test_exec, sensors_test)
- #domain_auto_trans(adbd, sensors_test_exec, sensors_test)
+ domain_auto_trans(shell, vendor_sensors_test_exec, vendor_sensors_test)
+ #domain_auto_trans(adbd, vendor_sensors_test_exec, vendor_sensors_test)
- allow sensors_test devpts:chr_file rw_file_perms;
- allow sensors_test sensors:unix_stream_socket connectto;
- allow sensors_test sensors_device:chr_file rw_file_perms;
- allow sensors_test smd_device:chr_file rw_file_perms;
- allow sensors_test socket_device:dir r_dir_perms;
+ allow vendor_sensors_test devpts:chr_file rw_file_perms;
+ allow vendor_sensors_test vendor_sensors:unix_stream_socket connectto;
+ allow vendor_sensors_test sensors_device:chr_file rw_file_perms;
+ allow vendor_sensors_test vendor_smd_device:chr_file rw_file_perms;
+ allow vendor_sensors_test socket_device:dir r_dir_perms;
')
diff --git a/generic/vendor/test/service.te b/generic/vendor/test/service.te
index e469d13..4918b3b 100644
--- a/generic/vendor/test/service.te
+++ b/generic/vendor/test/service.te
@@ -25,5 +25,5 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type fidotest_service, service_manager_type;
-type qseeproxysample_service, service_manager_type;
+type vendor_fidotest_service, service_manager_type;
+type vendor_qseeproxysample_service, service_manager_type;
diff --git a/generic/vendor/test/service_contexts b/generic/vendor/test/service_contexts
index 787c9f5..d84a1f7 100644
--- a/generic/vendor/test/service_contexts
+++ b/generic/vendor/test/service_contexts
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-com.qualcomm.qti.auth.securesampleauthdaemon u:object_r:fidotest_service:s0
-com.qualcomm.qti.qseeproxysample u:object_r:qseeproxysample_service:s0
+com.qualcomm.qti.auth.securesampleauthdaemon u:object_r:vendor_fidotest_service:s0
+com.qualcomm.qti.qseeproxysample u:object_r:vendor_qseeproxysample_service:s0
diff --git a/generic/vendor/test/smd_test.te b/generic/vendor/test/smd_test.te
index 81c7f7d..3a79bcc 100644
--- a/generic/vendor/test/smd_test.te
+++ b/generic/vendor/test/smd_test.te
@@ -26,15 +26,15 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#must be defined for file_contexts
-type smd_test_exec, exec_type, vendor_file_type, file_type;
+type vendor_smd_test_exec, exec_type, vendor_file_type, file_type;
userdebug_or_eng(`
- type smd_test, domain;
- domain_auto_trans(shell, smd_test_exec, smd_test)
- #domain_auto_trans(adbd, smd_test_exec, smd_test)
+ type vendor_smd_test, domain;
+ domain_auto_trans(shell, vendor_smd_test_exec, vendor_smd_test)
+ #domain_auto_trans(adbd, vendor_smd_test_exec, vendor_smd_test)
#SMD device node and test file contexts
- allow smd_test smd_device:chr_file {ioctl read write open getattr append};
+ allow vendor_smd_test vendor_smd_device:chr_file {ioctl read write open getattr append};
#tests are launched from pseudo terminal, so output will be directed there
#and as such needs adequate allow rules
- allow smd_test devpts:chr_file {ioctl read write open getattr};
+ allow vendor_smd_test devpts:chr_file {ioctl read write open getattr};
')
diff --git a/generic/vendor/test/untrusted_app.te b/generic/vendor/test/untrusted_app.te
index ce8f693..08b3a13 100644
--- a/generic/vendor/test/untrusted_app.te
+++ b/generic/vendor/test/untrusted_app.te
@@ -27,11 +27,11 @@
#allow untrusted_app clients to access configuration settings
userdebug_or_eng(`
-allow untrusted_app sysfs_kgsl:dir search;
+allow untrusted_app vendor_sysfs_kgsl:dir search;
dontaudit {
untrusted_app
-} sysfs_kgsl:dir read;
-r_dir_file(untrusted_app, sysfs_kgsl_snapshot);
+} vendor_sysfs_kgsl:dir read;
+r_dir_file(untrusted_app, vendor_sysfs_kgsl_snapshot);
r_dir_file(untrusted_app, vendor_gles_data_file);
allow untrusted_app vendor_gles_data_file:dir rw_dir_perms;
allow untrusted_app vendor_gles_data_file:file rw_file_perms;
diff --git a/generic/vendor/test/untrusted_app_25.te b/generic/vendor/test/untrusted_app_25.te
index 410d947..04cd3bd 100644
--- a/generic/vendor/test/untrusted_app_25.te
+++ b/generic/vendor/test/untrusted_app_25.te
@@ -27,8 +27,8 @@
#allow untrusted_app_25 clients to access configuration settings
userdebug_or_eng(`
-allow untrusted_app_25 sysfs_kgsl:dir search;
-r_dir_file(untrusted_app_25, sysfs_kgsl_snapshot);
+allow untrusted_app_25 vendor_sysfs_kgsl:dir search;
+r_dir_file(untrusted_app_25, vendor_sysfs_kgsl_snapshot);
r_dir_file(untrusted_app_25, vendor_gles_data_file);
allow untrusted_app_25 vendor_gles_data_file:dir rw_dir_perms;
allow untrusted_app_25 vendor_gles_data_file:file rw_file_perms;
diff --git a/generic/vendor/test/untrusted_app_27.te b/generic/vendor/test/untrusted_app_27.te
index 39ba6dd..b934a61 100644
--- a/generic/vendor/test/untrusted_app_27.te
+++ b/generic/vendor/test/untrusted_app_27.te
@@ -27,10 +27,10 @@
#allow untrusted_app_27 clients to access configuration settings
userdebug_or_eng(`
-allow untrusted_app_27 sysfs_kgsl:dir search;
-dontaudit untrusted_app_27 sysfs_kgsl:dir read;
-dontaudit untrusted_app_27 sysfs_kgsl:file read;
-r_dir_file(untrusted_app_27, sysfs_kgsl_snapshot);
+allow untrusted_app_27 vendor_sysfs_kgsl:dir search;
+dontaudit untrusted_app_27 vendor_sysfs_kgsl:dir read;
+dontaudit untrusted_app_27 vendor_sysfs_kgsl:file read;
+r_dir_file(untrusted_app_27, vendor_sysfs_kgsl_snapshot);
r_dir_file(untrusted_app_27, vendor_gles_data_file);
allow untrusted_app_27 vendor_gles_data_file:dir rw_dir_perms;
allow untrusted_app_27 vendor_gles_data_file:file rw_file_perms;
diff --git a/generic/vendor/test/usta_app.te b/generic/vendor/test/usta_app.te
index 316fe95..5d59e1e 100644
--- a/generic/vendor/test/usta_app.te
+++ b/generic/vendor/test/usta_app.te
@@ -25,40 +25,40 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-## usta_app
+## vendor_usta_app
##
-## This file defines the permissions that usta_apps can carry
+## This file defines the permissions that vendor_usta_apps can carry
-type usta_app, domain;
+type vendor_usta_app, domain;
-app_domain(usta_app)
-hal_client_domain(usta_app, hal_perf)
-get_prop(usta_app, sensors_prop)
+app_domain(vendor_usta_app)
+hal_client_domain(vendor_usta_app, vendor_hal_perf)
+get_prop(vendor_usta_app, vendor_sensors_prop)
-#allow only usta_app with userdebug to access ioctl
+#allow only vendor_usta_app with userdebug to access ioctl
userdebug_or_eng(`
- diag_use(usta_app)
- get_prop(usta_app, sensors_dbg_prop)
- allowxperm usta_app self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
- allow usta_app self:{ socket qipcrtr_socket } create_socket_perms;
- allow usta_app xdsp_device:chr_file r_file_perms;
- allow usta_app sysfs_timestamp_switch:file r_file_perms;
+ diag_use(vendor_usta_app)
+ get_prop(vendor_usta_app, vendor_sensors_dbg_prop)
+ allowxperm vendor_usta_app self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+ allow vendor_usta_app self:{ socket qipcrtr_socket } create_socket_perms;
+ allow vendor_usta_app vendor_xdsp_device:chr_file r_file_perms;
+ allow vendor_usta_app vendor_sysfs_timestamp_switch:file r_file_perms;
')
-allow usta_app {
+allow vendor_usta_app {
app_api_service
surfaceflinger_service
}:service_manager find;
-allow usta_app system_app_data_file:dir create_dir_perms;
-allow usta_app system_app_data_file:file create_file_perms;
+allow vendor_usta_app system_app_data_file:dir create_dir_perms;
+allow vendor_usta_app system_app_data_file:file create_file_perms;
-allow usta_app sensors_data_file:dir create_dir_perms;
-allow usta_app sensors_data_file:file create_file_perms;
+allow vendor_usta_app vendor_sensors_data_file:dir create_dir_perms;
+allow vendor_usta_app vendor_sensors_data_file:file create_file_perms;
-allow usta_app persist_sensors_file:dir create_dir_perms;
-allow usta_app persist_sensors_file:file create_file_perms;
-allow usta_app mnt_vendor_file:dir create_dir_perms;
+allow vendor_usta_app vendor_persist_sensors_file:dir create_dir_perms;
+allow vendor_usta_app vendor_persist_sensors_file:file create_file_perms;
+allow vendor_usta_app mnt_vendor_file:dir create_dir_perms;
-dontaudit usta_app system_data_file:file open;
-allow usta_app cgroup:file w_file_perms;
+dontaudit vendor_usta_app system_data_file:file open;
+allow vendor_usta_app cgroup:file w_file_perms;
diff --git a/generic/vendor/test/ustaservice_app.te b/generic/vendor/test/ustaservice_app.te
index 8d5d8a3..ee39cd9 100644
--- a/generic/vendor/test/ustaservice_app.te
+++ b/generic/vendor/test/ustaservice_app.te
@@ -24,28 +24,28 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type ustaservice_app, domain;
-app_domain(ustaservice_app)
+type vendor_ustaservice_app, domain;
+app_domain(vendor_ustaservice_app)
#TODO(b/142498985): Review sepolicy neverallow violation
-#allow ustaservice_app usta_app_service:service_manager add;
-allow ustaservice_app usta_app_service:service_manager find;
-allow ustaservice_app activity_service:service_manager find;
-allow ustaservice_app app_api_service:service_manager find;
+#allow vendor_ustaservice_app usta_app_service:service_manager add;
+allow vendor_ustaservice_app usta_app_service:service_manager find;
+allow vendor_ustaservice_app activity_service:service_manager find;
+allow vendor_ustaservice_app app_api_service:service_manager find;
userdebug_or_eng(`
- allowxperm ustaservice_app self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
- allow ustaservice_app self:{ socket qipcrtr_socket } create_socket_perms;
- allow ustaservice_app xdsp_device:chr_file r_file_perms;
- allow ustaservice_app ssr_device:chr_file r_file_perms;
+ allowxperm vendor_ustaservice_app self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+ allow vendor_ustaservice_app self:{ socket qipcrtr_socket } create_socket_perms;
+ allow vendor_ustaservice_app vendor_xdsp_device:chr_file r_file_perms;
+ allow vendor_ustaservice_app vendor_ssr_device:chr_file r_file_perms;
')
-hwbinder_use(ustaservice_app)
+hwbinder_use(vendor_ustaservice_app)
userdebug_or_eng(`
- diag_use(ustaservice_app)
+ diag_use(vendor_ustaservice_app)
')
-allow ustaservice_app system_app_data_file:dir create_dir_perms;
-allow ustaservice_app system_app_data_file:file create_file_perms;
-allow ustaservice_app cgroup:file w_file_perms;
+allow vendor_ustaservice_app system_app_data_file:dir create_dir_perms;
+allow vendor_ustaservice_app system_app_data_file:file create_file_perms;
+allow vendor_ustaservice_app cgroup:file w_file_perms;
diff --git a/qva/vendor/atoll/device.te b/qva/vendor/atoll/device.te
index dcf6538..28e7e54 100755
--- a/qva/vendor/atoll/device.te
+++ b/qva/vendor/atoll/device.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#logdump partition
-type logdump_partition, dev_type;
-type mba_debug_dev, dev_type;
-type dip_device, dev_type;
-type rawdump_block_device, dev_type;
+type vendor_logdump_partition, dev_type;
+type vendor_mba_debug_dev, dev_type;
+type vendor_dip_device, dev_type;
+type vendor_rawdump_block_device, dev_type;
diff --git a/qva/vendor/atoll/file.te b/qva/vendor/atoll/file.te
index 2d56f78..4e2b1fd 100644
--- a/qva/vendor/atoll/file.te
+++ b/qva/vendor/atoll/file.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sysfs_fps_attr, fs_type, sysfs_type;
+type vendor_sysfs_fps_attr, fs_type, sysfs_type;
diff --git a/qva/vendor/atoll/file_contexts b/qva/vendor/atoll/file_contexts
index fd55167..5cab83d 100644
--- a/qva/vendor/atoll/file_contexts
+++ b/qva/vendor/atoll/file_contexts
@@ -28,7 +28,7 @@
# Dev block nodes
#Primary storage device nodes
-/dev/block/mmcblk0rpmb u:object_r:rpmb_device:s0
+/dev/block/mmcblk0rpmb u:object_r:vendor_rpmb_device:s0
/dev/block/mmcblk0 u:object_r:root_block_device:s0
# UFS Devices
@@ -36,59 +36,59 @@
/dev/block/platform/soc/1d84000.ufshc/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:vendor_dip_device:s0
#rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:persist_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
##################################
# non-hlos mount points
@@ -96,67 +96,67 @@
/bt_firmware u:object_r:bt_firmware_file:s0
#for eMMC
-/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/vendor_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
#non A/B
/dev/block/platform/soc/7c4000.sdhci/by-name/system u:object_r:system_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dip u:object_r:vendor_dip_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/storsec u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/persist u:object_r:persist_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/persist u:object_r:vendor_persist_block_device:s0
#rawdump partition
-/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:init-qti-fbe-sh_exec:s0
-/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:vendor_init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:vendor_qti_init_shell_exec:s0
#QFPROM0 file access
-/sys/devices/platform/soc/786018.qfprom/qfprom0/nvmem u:object_r:sysfs_qfprom:s0
+/sys/devices/platform/soc/786018.qfprom/qfprom0/nvmem u:object_r:vendor_sysfs_qfprom:s0
#FPC
-/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:sysfs_fps_attr:s0
-/sys/devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-03/200f000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/modalias u:object_r:sysfs_fps_attr:s0
+/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:vendor_sysfs_fps_attr:s0
+/sys/devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-03/200f000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/modalias u:object_r:vendor_sysfs_fps_attr:s0
diff --git a/qva/vendor/atoll/genfs_contexts b/qva/vendor/atoll/genfs_contexts
index 82b6ec6..54344ed 100644
--- a/qva/vendor/atoll/genfs_contexts
+++ b/qva/vendor/atoll/genfs_contexts
@@ -27,80 +27,80 @@
###################################
#pmic sysfs_nodes
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/dc u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/main u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/pc_port u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/usb u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:sysfs_usbpd_device:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qpnp,qg/power_supply/bms u:object_r:sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/dc u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:vendor_sysfs_usbpd_device:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qpnp,qg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,pm6150_rtc/rtc u:object_r:sysfs_rtc:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0008/88c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-000c/88c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /class/qcom-battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /class/charge_pump u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-000c/a8c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0008/a8c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0010/a8c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0008/88c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-000c/88c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /class/qcom-battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /class/charge_pump u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-000c/a8c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0008/a8c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0010/a8c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:vendor_sysfs_battery_supply:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-01/c440000.qcom,spmi:qcom,pm6150@1:qcom,vibrator@5300/leds/vibrator u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/red u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/green u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/blue u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/red u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/green u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/blue u:object_r:vendor_sysfs_graphics:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d300/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,wled@d800/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,wled@d800/backlight u:object_r:sysfs_leds:s0
# subsys SSR entries
-genfscon sysfs /devices/platform/soc/62400000.qcom,lpass/subsys0/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/62400000.qcom,lpass/subsys0/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:vendor_sysfs_ssr:s0
#diffrent target using same apps combo
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys5/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys6/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys5/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys6/name u:object_r:vendor_sysfs_ssr:s0
# We see this combo set also so adding this also
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/62400000.qcom,lpass/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys4/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/62400000.qcom,lpass/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys4/name u:object_r:vendor_sysfs_ssr:s0
#entry for usb controller
-genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:sysfs_usb_controller:s0
+genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:vendor_sysfs_usb_controller:s0
#qdss sysfs-node
-genfscon sysfs /devices/platform/soc/6047000.tmc/coresight-tmc-etf u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/91866f0.hwevent/coresight-hwevent u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6b0e000.csr/coresight-swao-csr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/6047000.tmc/coresight-tmc-etf u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/91866f0.hwevent/coresight-hwevent u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6b0e000.csr/coresight-swao-csr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
#fps sysfs-node
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
#subsys nodes
genfscon sysfs /devices/platform/soc/soc:bt_qca6174/extldo u:object_r:sysfs_bluetooth_writable:s0
genfscon sysfs /devices/platform/soc/soc:bt_qca6174/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0
diff --git a/qva/vendor/atoll/init-qti-fbe-sh.te b/qva/vendor/atoll/init-qti-fbe-sh.te
index a1cc3bd..ee17f17 100644
--- a/qva/vendor/atoll/init-qti-fbe-sh.te
+++ b/qva/vendor/atoll/init-qti-fbe-sh.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qti-fbe-sh, domain;
-type init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
+type vendor_init-qti-fbe-sh, domain;
+type vendor_init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(init-qti-fbe-sh)
+init_daemon_domain(vendor_init-qti-fbe-sh)
-allow init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
# execute toybox/toolbox
-allow init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
-get_prop(init-qti-fbe-sh, vendor_tee_listener_prop)
+allow vendor_init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
+get_prop(vendor_init-qti-fbe-sh, vendor_tee_listener_prop)
diff --git a/qva/vendor/bengal/init-qti-fbe-sh.te b/qva/vendor/bengal/init-qti-fbe-sh.te
index 0f02b0e..8f72daf 100644
--- a/qva/vendor/bengal/init-qti-fbe-sh.te
+++ b/qva/vendor/bengal/init-qti-fbe-sh.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qti-fbe-sh, domain;
-type init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
+type vendor_init-qti-fbe-sh, domain;
+type vendor_init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(init-qti-fbe-sh)
+init_daemon_domain(vendor_init-qti-fbe-sh)
-allow init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
# execute toybox/toolbox
-allow init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
-get_prop(init-qti-fbe-sh, vendor_tee_listener_prop)
+allow vendor_init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
+get_prop(vendor_init-qti-fbe-sh, vendor_tee_listener_prop)
diff --git a/qva/vendor/common/adpl.te b/qva/vendor/common/adpl.te
index 4c6df47..8177e89 100644
--- a/qva/vendor/common/adpl.te
+++ b/qva/vendor/common/adpl.te
@@ -25,26 +25,26 @@
#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type adpl, domain;
-type adpl_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(adpl)
-net_domain(adpl)
+type vendor_adpl, domain;
+type vendor_adpl_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_adpl)
+net_domain(vendor_adpl)
-allow adpl { rmnet_device mhi_device ipa_dev }:chr_file rw_file_perms;
+allow vendor_adpl { vendor_rmnet_device vendor_mhi_device vendor_ipa_dev }:chr_file rw_file_perms;
-allow adpl self:{
+allow vendor_adpl self:{
socket
udp_socket
qipcrtr_socket
} create_socket_perms_no_ioctl;
-set_prop(adpl, vendor_dataadpl_prop)
+set_prop(vendor_adpl, vendor_dataadpl_prop)
#diag
userdebug_or_eng(`
- diag_use(adpl)
- allow adpl sysfs_data:file r_file_perms;
+ diag_use(vendor_adpl)
+ allow vendor_adpl vendor_sysfs_data:file r_file_perms;
')
-#Allow adpl to create adpl socket
-allow adpl dataadpl_socket:sock_file rw_file_perms;
+#Allow vendor_adpl to create vendor_adpl socket
+allow vendor_adpl vendor_dataadpl_socket:sock_file rw_file_perms;
diff --git a/qva/vendor/common/attributes b/qva/vendor/common/attributes
index 9a93efb..10e728f 100644
--- a/qva/vendor/common/attributes
+++ b/qva/vendor/common/attributes
@@ -25,94 +25,94 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-attribute hal_alarm_qti;
-attribute hal_alarm_qti_client;
-attribute hal_alarm_qti_server;
+attribute vendor_hal_alarm_qti;
+attribute vendor_hal_alarm_qti_client;
+attribute vendor_hal_alarm_qti_server;
-attribute hal_iop;
-attribute hal_iop_client;
-attribute hal_iop_server;
+attribute vendor_hal_iop;
+attribute vendor_hal_iop_client;
+attribute vendor_hal_iop_server;
-attribute hal_soter;
-attribute hal_soter_client;
-attribute hal_soter_server;
+attribute vendor_hal_soter;
+attribute vendor_hal_soter_client;
+attribute vendor_hal_soter_server;
-attribute hal_sensorscalibrate_qti;
-attribute hal_sensorscalibrate_qti_client;
-attribute hal_sensorscalibrate_qti_server;
+attribute vendor_hal_sensorscalibrate_qti;
+attribute vendor_hal_sensorscalibrate_qti_client;
+attribute vendor_hal_sensorscalibrate_qti_server;
-attribute hal_scve;
-attribute hal_scve_client;
-attribute hal_scve_server;
+attribute vendor_hal_scve;
+attribute vendor_hal_scve_client;
+attribute vendor_hal_scve_server;
-attribute hal_pasrmanager;
-attribute hal_pasrmanager_client;
-attribute hal_pasrmanager_server;
+attribute vendor_hal_pasrmanager;
+attribute vendor_hal_pasrmanager_client;
+attribute vendor_hal_pasrmanager_server;
-attribute hal_qteeconnector;
-attribute hal_qteeconnector_client;
-attribute hal_qteeconnector_server;
+attribute vendor_hal_qteeconnector;
+attribute vendor_hal_qteeconnector_client;
+attribute vendor_hal_qteeconnector_server;
-attribute hal_secureprocessor;
-attribute hal_secureprocessor_client;
-attribute hal_secureprocessor_server;
+attribute vendor_hal_secureprocessor;
+attribute vendor_hal_secureprocessor_client;
+attribute vendor_hal_secureprocessor_server;
-attribute hal_seccam;
-attribute hal_seccam_client;
-attribute hal_seccam_server;
+attribute vendor_hal_seccam;
+attribute vendor_hal_seccam_client;
+attribute vendor_hal_seccam_server;
-attribute wifidisplayhalservice;
-attribute wifidisplayhalservice_client;
-attribute wifidisplayhalservice_server;
+attribute vendor_wifidisplayhalservice;
+attribute vendor_wifidisplayhalservice_client;
+attribute vendor_wifidisplayhalservice_server;
-attribute hal_vpp;
-attribute hal_vpp_client;
-attribute hal_vpp_server;
+attribute vendor_hal_vpp;
+attribute vendor_hal_vpp_client;
+attribute vendor_hal_vpp_server;
-attribute hal_esepowermanager;
-attribute hal_esepowermanager_client;
-attribute hal_esepowermanager_server;
+attribute vendor_hal_esepowermanager;
+attribute vendor_hal_esepowermanager_client;
+attribute vendor_hal_esepowermanager_server;
attribute vendor_hal_factory_qti;
attribute vendor_hal_factory_qti_client;
attribute vendor_hal_factory_qti_server;
-attribute hal_cvp;
-attribute hal_cvp_client;
-attribute hal_cvp_server;
+attribute vendor_hal_cvp;
+attribute vendor_hal_cvp_client;
+attribute vendor_hal_cvp_server;
-attribute hal_fm;
-attribute hal_fm_client;
-attribute hal_fm_server;
+attribute vendor_hal_fm;
+attribute vendor_hal_fm_client;
+attribute vendor_hal_fm_server;
-attribute hal_wigig;
-attribute hal_wigig_client;
-attribute hal_wigig_server;
+attribute vendor_hal_wigig;
+attribute vendor_hal_wigig_client;
+attribute vendor_hal_wigig_server;
-attribute hal_wigig_npt;
-attribute hal_wigig_npt_client;
-attribute hal_wigig_npt_server;
+attribute vendor_hal_wigig_npt;
+attribute vendor_hal_wigig_npt_client;
+attribute vendor_hal_wigig_npt_server;
-attribute hal_fstman;
-attribute hal_fstman_client;
-attribute hal_fstman_server;
+attribute vendor_hal_fstman;
+attribute vendor_hal_fstman_client;
+attribute vendor_hal_fstman_server;
-attribute hal_btconfigstore;
-attribute hal_btconfigstore_client;
-attribute hal_btconfigstore_server;
+attribute vendor_hal_btconfigstore;
+attribute vendor_hal_btconfigstore_client;
+attribute vendor_hal_btconfigstore_server;
-attribute hal_wifilearner;
-attribute hal_wifilearner_client;
-attribute hal_wifilearner_server;
+attribute vendor_hal_wifilearner;
+attribute vendor_hal_wifilearner_client;
+attribute vendor_hal_wifilearner_server;
-attribute hal_srvctracker;
-attribute hal_srvctracker_client;
-attribute hal_srvctracker_server;
+attribute vendor_hal_srvctracker;
+attribute vendor_hal_srvctracker_client;
+attribute vendor_hal_srvctracker_server;
-attribute hal_qspmhal;
-attribute hal_qspmhal_client;
-attribute hal_qspmhal_server;
+attribute vendor_hal_qspmhal;
+attribute vendor_hal_qspmhal_client;
+attribute vendor_hal_qspmhal_server;
-attribute hal_bluetooth_dun;
-attribute hal_bluetooth_dun_client;
-attribute hal_bluetooth_dun_server;
+attribute vendor_hal_bluetooth_dun;
+attribute vendor_hal_bluetooth_dun_client;
+attribute vendor_hal_bluetooth_dun_server;
diff --git a/qva/vendor/common/bluetooth.te b/qva/vendor/common/bluetooth.te
index 219169d..323a4a8 100644
--- a/qva/vendor/common/bluetooth.te
+++ b/qva/vendor/common/bluetooth.te
@@ -26,10 +26,10 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#allow bluetooth to access btconfigstore hal
-hal_client_domain(bluetooth, hal_btconfigstore);
+hal_client_domain(bluetooth, vendor_hal_btconfigstore);
#allow bluetooth to access perf hal
-hal_client_domain(bluetooth, hal_perf);
+hal_client_domain(bluetooth, vendor_hal_perf);
#allow bluetooth to access bluetooth_dun hal
-hal_client_domain(bluetooth, hal_bluetooth_dun);
+hal_client_domain(bluetooth, vendor_hal_bluetooth_dun);
diff --git a/qva/vendor/common/cnd.te b/qva/vendor/common/cnd.te
index b4d2b74..b075350 100644
--- a/qva/vendor/common/cnd.te
+++ b/qva/vendor/common/cnd.te
@@ -25,47 +25,47 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-set_prop(cnd, cnd_vendor_prop)
+set_prop(vendor_cnd, vendor_cnd_vendor_prop)
-net_domain(cnd)
+net_domain(vendor_cnd)
-allow cnd smem_log_device:chr_file rw_file_perms;
+allow vendor_cnd vendor_smem_log_device:chr_file rw_file_perms;
-# allow cnd the following capability
-allow cnd self:capability {
+# allow vendor_cnd the following capability
+allow vendor_cnd self:capability {
net_admin
};
-allow cnd self:{
+allow vendor_cnd self:{
netlink_tcpdiag_socket
netlink_route_socket
} create_socket_perms_no_ioctl;
-# allow cnd to access wpa_socket
-allow cnd wifi_vendor_data_file:dir r_dir_perms;
-allow cnd wifi_vendor_wpa_socket:sock_file write;
+# allow vendor_cnd to access wpa_socket
+allow vendor_cnd vendor_wifi_vendor_data_file:dir r_dir_perms;
+allow vendor_cnd vendor_wifi_vendor_wpa_socket:sock_file write;
-#allow cnd daemon to invoke hostapd_cli
-allow cnd vendor_shell_exec:file rx_file_perms;
-domain_auto_trans(cnd, hostapd_exec, hostapd)
-allow cnd hostapd_socket:dir r_dir_perms;
-unix_socket_send(cnd, hostapd, hostapd)
+#allow vendor_cnd daemon to invoke hostapd_cli
+allow vendor_cnd vendor_shell_exec:file rx_file_perms;
+domain_auto_trans(vendor_cnd, vendor_hostapd_exec, vendor_hostapd)
+allow vendor_cnd vendor_hostapd_socket:dir r_dir_perms;
+unix_socket_send(vendor_cnd, vendor_hostapd, vendor_hostapd)
# only allow getopt for appdomain
allow appdomain zygote:unix_dgram_socket getopt;
dontaudit { domain -appdomain } zygote:unix_dgram_socket getopt;
-allow cnd self:socket create_socket_perms_no_ioctl;
+allow vendor_cnd self:socket create_socket_perms_no_ioctl;
-allowxperm cnd self:udp_socket ioctl wlan_sock_ioctls;
+allowxperm vendor_cnd self:udp_socket ioctl wlan_sock_ioctls;
-add_hwservice(cnd, hal_latency_hwservice)
+add_hwservice(vendor_cnd, vendor_hal_latency_hwservice)
##############################################################
#for using public interface vendor.qti.data.factory
-#client should add their domain to cnd.te
+#client should add their domain to vendor_cnd.te
##############################################################
userdebug_or_eng(`
- binder_call(cnd, radio)
- diag_use(cnd)
+ binder_call(vendor_cnd, radio)
+ diag_use(vendor_cnd)
')
diff --git a/qva/vendor/common/device.te b/qva/vendor/common/device.te
index cf87534..e90b1d4 100644
--- a/qva/vendor/common/device.te
+++ b/qva/vendor/common/device.te
@@ -25,23 +25,23 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hsic_device, dev_type;
-type skp_device, dev_type;
-type sp_keymaster_device, dev_type;
-type sp_ssr_device, dev_type;
-type spdaemon_ssr_device, dev_type;
-type iuicc_device, dev_type;
-type cryptoapp_device, dev_type;
-type sec_nvm_device, dev_type;
-type qbt_device, dev_type;
-type esoc_device, dev_type;
-type mhi_device, dev_type;
-type efs_boot_dev, dev_type;
-type smem_log_device, dev_type;
-type fm_radio_device, dev_type;
+type vendor_hsic_device, dev_type;
+type vendor_skp_device, dev_type;
+type vendor_sp_keymaster_device, dev_type;
+type vendor_sp_ssr_device, dev_type;
+type vendor_spdaemon_ssr_device, dev_type;
+type vendor_iuicc_device, dev_type;
+type vendor_cryptoapp_device, dev_type;
+type vendor_sec_nvm_device, dev_type;
+type vendor_qbt_device, dev_type;
+type vendor_esoc_device, dev_type;
+type vendor_mhi_device, dev_type;
+type vendor_efs_boot_dev, dev_type;
+type vendor_smem_log_device, dev_type;
+type vendor_fm_radio_device, dev_type;
#define qg char device
-type qg_device, dev_type;
+type vendor_qg_device, dev_type;
#define qvr external sensor device
-type qvr_external_sensor_device, dev_type;
+type vendor_qvr_external_sensor_device, dev_type;
diff --git a/qva/vendor/common/dpmd.te b/qva/vendor/common/dpmd.te
index f1645d7..2dc1c0d 100755
--- a/qva/vendor/common/dpmd.te
+++ b/qva/vendor/common/dpmd.te
@@ -32,12 +32,12 @@
wakelock_use(dpmd)
-r_dir_file(dpmd, sysfs_data)
+r_dir_file(dpmd, vendor_sysfs_data)
#Allow dpmd to connect to hal_dpmQMiMgr
-allow dpmd hal_dpmqmi_hwservice:hwservice_manager find;
+allow dpmd vendor_hal_dpmqmi_hwservice:hwservice_manager find;
get_prop(dpmd, hwservicemanager_prop)
-binder_call(dpmd,hal_dpmQmiMgr)
+binder_call(dpmd,vendor_hal_dpmQmiMgr)
hwbinder_use(dpmd)
#diag
diff --git a/qva/vendor/common/esepmdaemon.te b/qva/vendor/common/esepmdaemon.te
index 05800fa..d293647 100644
--- a/qva/vendor/common/esepmdaemon.te
+++ b/qva/vendor/common/esepmdaemon.te
@@ -25,29 +25,29 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type esepmdaemon, domain;
-type esepmdaemon_exec, exec_type, vendor_file_type, file_type;
+type vendor_esepmdaemon, domain;
+type vendor_esepmdaemon_exec, exec_type, vendor_file_type, file_type;
-#Allow for transition from init domain to esepmdaemon
-init_daemon_domain(esepmdaemon)
+#Allow for transition from init domain to vendor_esepmdaemon
+init_daemon_domain(vendor_esepmdaemon)
-#Allow esepmdaemon to use Binder IPC
-vndbinder_use(esepmdaemon)
+#Allow vendor_esepmdaemon to use Binder IPC
+vndbinder_use(vendor_esepmdaemon)
-#Allow apps to interact with esepmdaemon
-binder_call(esepmdaemon, system_app)
+#Allow apps to interact with vendor_esepmdaemon
+binder_call(vendor_esepmdaemon, system_app)
-#Allow esepmdaemon to be registered with service manager
-add_service(esepmdaemon, esepmdaemon_service)
+#Allow vendor_esepmdaemon to be registered with service manager
+add_service(vendor_esepmdaemon, vendor_esepmdaemon_service)
#Allow access to nfc device
-allow esepmdaemon nfc_device:chr_file rw_file_perms;
+allow vendor_esepmdaemon nfc_device:chr_file rw_file_perms;
-# Allow esepmdaemon to load firmware images
-r_dir_file(esepmdaemon, firmware_file);
+# Allow vendor_esepmdaemon to load firmware images
+r_dir_file(vendor_esepmdaemon, firmware_file);
-# Allow esepmdaemon to interract with ion_device
-allow esepmdaemon ion_device:chr_file r_file_perms;
+# Allow vendor_esepmdaemon to interract with ion_device
+allow vendor_esepmdaemon ion_device:chr_file r_file_perms;
-# Allow esepmdaemon to interract with qseecom
-allow esepmdaemon tee_device:chr_file rw_file_perms;
+# Allow vendor_esepmdaemon to interract with qseecom
+allow vendor_esepmdaemon tee_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/file.te b/qva/vendor/common/file.te
index a6151da..8264a65 100644
--- a/qva/vendor/common/file.te
+++ b/qva/vendor/common/file.te
@@ -28,90 +28,90 @@
#QTI file types
type vendor_qti_data_file, file_type, data_file_type;
-type persist_secnvm_file, file_type , vendor_persist_type;
+type vendor_persist_secnvm_file, file_type , vendor_persist_type;
#mink-lowi-interface-daemon (mlid) socket
-type mlid_socket, file_type, mlstrustedobject;
+type vendor_mlid_socket, file_type, mlstrustedobject;
#ssg qmi gateway daemon socket
-type ssgqmig_socket, file_type, mlstrustedobject;
+type vendor_ssgqmig_socket, file_type, mlstrustedobject;
#ssg tz daemon socket
-type ssgtzd_socket, file_type, mlstrustedobject;
+type vendor_ssgtzd_socket, file_type, mlstrustedobject;
-type qfp-daemon_data_file, file_type, data_file_type;
-type persist_qti_fp_file, file_type, vendor_persist_type;
-type sysfs_touch_aoi, fs_type, sysfs_type;
+type vendor_qfp-daemon_data_file, file_type, data_file_type;
+type vendor_persist_qti_fp_file, file_type, vendor_persist_type;
+type vendor_sysfs_touch_aoi, fs_type, sysfs_type;
#sysfs jpeg
-type sysfs_jpeg, fs_type, sysfs_type;
+type vendor_sysfs_jpeg, fs_type, sysfs_type;
# QDMA data files
type vendor_qdma_data_file, file_type, data_file_type;
-type qdma_socket, file_type, mlstrustedobject;
+type vendor_qdma_socket, file_type, mlstrustedobject;
-type sysfs_npu, fs_type, sysfs_type;
+type vendor_sysfs_npu, fs_type, sysfs_type;
type vendor_persist_mmi_file, file_type, vendor_persist_type;
-type persist_hvdcp_file, file_type, vendor_persist_type;
+type vendor_persist_hvdcp_file, file_type, vendor_persist_type;
#File type by mmi
type vendor_mmi_socket, file_type;
#ADPL socket file types
-type dataadpl_socket, file_type;
+type vendor_dataadpl_socket, file_type;
#perf
-type sysfs_lib, fs_type, sysfs_type;
-type sysfs_memory, fs_type, sysfs_type;
-type sysfs_process_reclaim, fs_type, sysfs_type;
+type vendor_sysfs_lib, fs_type, sysfs_type;
+type vendor_sysfs_memory, fs_type, sysfs_type;
+type vendor_sysfs_process_reclaim, fs_type, sysfs_type;
# secure element file type for data vendor access
-type secure_element_vendor_data_file, file_type, data_file_type;
+type vendor_secure_element_vendor_data_file, file_type, data_file_type;
#Define the files written during the operation of mpctl
-type sysfs_mpctl, fs_type, sysfs_type;
-type mpctl_socket, file_type, mlstrustedobject;
-type mpctl_data_file, file_type, data_file_type;
+type vendor_sysfs_mpctl, fs_type, sysfs_type;
+type vendor_mpctl_socket, file_type, mlstrustedobject;
+type vendor_mpctl_data_file, file_type, data_file_type;
#IOP
-type iop_socket, file_type;
-type iop_data_file, file_type, data_file_type;
+type vendor_iop_socket, file_type;
+type vendor_iop_data_file, file_type, data_file_type;
#Define the files used by lm
-type lm_data_file, file_type, data_file_type;
+type vendor_lm_data_file, file_type, data_file_type;
# Wifi Data file
-type wifi_vendor_data_file, file_type, data_file_type;
-type wifi_vendor_wpa_socket, file_type, data_file_type;
-type hostapd_socket, file_type, data_file_type;
+type vendor_wifi_vendor_data_file, file_type, data_file_type;
+type vendor_wifi_vendor_wpa_socket, file_type, data_file_type;
+type vendor_hostapd_socket, file_type, data_file_type;
#vpp
type vendor_vpp_data_file, file_type, data_file_type;
-type persist_vpp_file, file_type, vendor_persist_type;
+type vendor_persist_vpp_file, file_type, vendor_persist_type;
# Spdaemon file
-type sysfs_spdaemon, fs_type, sysfs_type;
+type vendor_sysfs_spdaemon, fs_type, sysfs_type;
# wigig, fstman
-type sysfs_wigig, fs_type, sysfs_type;
-type wigignpt_socket, file_type;
-type wigig_vendor_wpa_socket, file_type;
+type vendor_sysfs_wigig, fs_type, sysfs_type;
+type vendor_wigignpt_socket, file_type;
+type vendor_wigig_vendor_wpa_socket, file_type;
# wigig_hostapd
-type wigig_hostapd_socket, file_type, data_file_type;
-type sensingdaemon_socket, file_type;
-type sensing_vendor_data_file, file_type, data_file_type;
+type vendor_wigig_hostapd_socket, file_type, data_file_type;
+type vendor_sensingdaemon_socket, file_type;
+type vendor_sensing_vendor_data_file, file_type, data_file_type;
#rmnet module files
-type sysfs_rmnet, fs_type, sysfs_type;
+type vendor_sysfs_rmnet, fs_type, sysfs_type;
#qvrservice sysfs files
-type sysfs_qvr_external_sensor, sysfs_type, fs_type;
+type vendor_sysfs_qvr_external_sensor, sysfs_type, fs_type;
#qspm-hal
type vendor_qspmhal_data_file, file_type, data_file_type;
#Memory offlining file types
-type sysfs_memory_offline, sysfs_type, fs_type;
+type vendor_sysfs_memory_offline, sysfs_type, fs_type;
-type sysfs_qfprom, fs_type, sysfs_type;
+type vendor_sysfs_qfprom, fs_type, sysfs_type;
diff --git a/qva/vendor/common/file_contexts b/qva/vendor/common/file_contexts
index 9dfe4d8..2d04be9 100644
--- a/qva/vendor/common/file_contexts
+++ b/qva/vendor/common/file_contexts
@@ -28,163 +28,162 @@
###################################
#Dev nodes
#
-/dev/hsicctl.* u:object_r:hsic_device:s0
-/dev/sp_kernel u:object_r:skp_device:s0
-/dev/sp_keymaster u:object_r:sp_keymaster_device:s0
-/dev/sp_ssr u:object_r:sp_ssr_device:s0
-/dev/spdaemon_ssr u:object_r:spdaemon_ssr_device:s0
-/dev/iuicc u:object_r:iuicc_device:s0
-/dev/cryptoapp u:object_r:cryptoapp_device:s0
-/dev/sec_nvm_.* u:object_r:sec_nvm_device:s0
-/dev/qbt.* u:object_r:qbt_device:s0
-/dev/esoc.* u:object_r:esoc_device:s0
-/dev/mhi_.* u:object_r:mhi_device:s0
-/dev/smem_log u:object_r:smem_log_device:s0
-/dev/radio0 u:object_r:fm_radio_device:s0
-/dev/qg u:object_r:qg_device:s0
-/dev/qg_battery u:object_r:qg_device:s0
-/dev/qvr_external_sensor_ioctl u:object_r:qvr_external_sensor_device:s0
+/dev/hsicctl.* u:object_r:vendor_hsic_device:s0
+/dev/sp_kernel u:object_r:vendor_skp_device:s0
+/dev/sp_keymaster u:object_r:vendor_sp_keymaster_device:s0
+/dev/sp_ssr u:object_r:vendor_sp_ssr_device:s0
+/dev/spdaemon_ssr u:object_r:vendor_spdaemon_ssr_device:s0
+/dev/iuicc u:object_r:vendor_iuicc_device:s0
+/dev/cryptoapp u:object_r:vendor_cryptoapp_device:s0
+/dev/sec_nvm_.* u:object_r:vendor_sec_nvm_device:s0
+/dev/qbt.* u:object_r:vendor_qbt_device:s0
+/dev/esoc.* u:object_r:vendor_esoc_device:s0
+/dev/mhi_.* u:object_r:vendor_mhi_device:s0
+/dev/smem_log u:object_r:vendor_smem_log_device:s0
+/dev/radio0 u:object_r:vendor_fm_radio_device:s0
+/dev/qg u:object_r:vendor_qg_device:s0
+/dev/qg_battery u:object_r:vendor_qg_device:s0
+/dev/qvr_external_sensor_ioctl u:object_r:vendor_qvr_external_sensor_device:s0
###################################
# Dev socket nodes
#
-/dev/socket/iop u:object_r:iop_socket:s0
-/dev/socket/mlid u:object_r:mlid_socket:s0
-/dev/socket/ssgqmig u:object_r:ssgqmig_socket:s0
-/dev/socket/ssgtzd u:object_r:ssgtzd_socket:s0
-/dev/socket/qdma(/.*)? u:object_r:qdma_socket:s0
-/dev/socket/adpl_cmd_uds_file u:object_r:dataadpl_socket:s0
-/dev/socket/wigig/wpa_wigig[0-9] u:object_r:wigig_vendor_wpa_socket:s0
-/dev/socket/vendor_wpa_wlan[0-9] u:object_r:wifi_vendor_wpa_socket:s0
-/dev/socket/wigig/wigignpt u:object_r:wigignpt_socket:s0
-/dev/socket/wigig/sensingdaemon u:object_r:sensingdaemon_socket:s0
+/dev/socket/iop u:object_r:vendor_iop_socket:s0
+/dev/socket/mlid u:object_r:vendor_mlid_socket:s0
+/dev/socket/ssgqmig u:object_r:vendor_ssgqmig_socket:s0
+/dev/socket/ssgtzd u:object_r:vendor_ssgtzd_socket:s0
+/dev/socket/qdma(/.*)? u:object_r:vendor_qdma_socket:s0
+/dev/socket/adpl_cmd_uds_file u:object_r:vendor_dataadpl_socket:s0
+/dev/socket/wigig/wpa_wigig[0-9] u:object_r:vendor_wigig_vendor_wpa_socket:s0
+/dev/socket/wigig/vendor_wpa_wlan[0-9] u:object_r:vendor_wigig_vendor_wpa_socket:s0
+/dev/socket/wigig/wigignpt u:object_r:vendor_wigignpt_socket:s0
+/dev/socket/wigig/sensingdaemon u:object_r:vendor_sensingdaemon_socket:s0
###################################
# System files
#
-/(vendor|system/vendor)/bin/dpmQmiMgr u:object_r:hal_dpmQmiMgr_exec:s0
-/vendor/bin/hw/android\.hardware\.keymaster@4\.0-strongbox-service-qti u:object_r:hal_keymaster_qti_exec:s0
-/vendor/bin/hw/vendor\.qti\.hardware\.cryptfshw@1\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.2-service.clearkey u:object_r:hal_drm_clearkey_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy.clearkey u:object_r:hal_drm_clearkey_exec:s0
+/(vendor|system/vendor)/bin/dpmQmiMgr u:object_r:vendor_hal_dpmQmiMgr_exec:s0
+/vendor/bin/hw/android\.hardware\.keymaster@4\.0-strongbox-service-qti u:object_r:vendor_hal_keymaster_qti_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.cryptfshw@1\.0-service-qti u:object_r:vendor_hal_keymaster_qti_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@1\.2-service.clearkey u:object_r:vendor_hal_drm_clearkey_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy.clearkey u:object_r:vendor_hal_drm_clearkey_exec:s0
/vendor/bin/hw/vendor\.nxp\.hardware\.nfc@1\.1-service u:object_r:hal_nfc_default_exec:s0
/vendor/bin/hw/vendor\.nxp\.hardware\.nfc@1\.2-service u:object_r:hal_nfc_default_exec:s0
/vendor/bin/hw/vendor\.nxp\.hardware\.nfc@1\.3-service u:object_r:hal_nfc_default_exec:s0
-/vendor/bin/hw/vendor\.qti\.hardware\.alarm@1\.0-service u:object_r:hal_alarm_qti_default_exec:s0
-/vendor/bin/hw/vendor\.qti\.hardware\.iop@2\.0-service u:object_r:hal_iop_default_exec:s0
-/vendor/bin/hw/vendor\.qti\.hardware\.qteeconnector@1\.0-service u:object_r:hal_qteeconnector_qti_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.alarm@1\.0-service u:object_r:vendor_hal_alarm_qti_default_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.iop@2\.0-service u:object_r:vendor_hal_iop_default_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.qteeconnector@1\.0-service u:object_r:vendor_hal_qteeconnector_qti_exec:s0
/vendor/bin/hw/vendor\.qti\.hardware\.scve\.objecttracker@1\.0-service u:object_r:vendor_scve_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.scve\.panorama@1\.0-service u:object_r:vendor_scve_exec:s0
-/vendor/bin/hw/vendor\.qti\.hardware\.sensorscalibrate@1\.0-service u:object_r:hal_sensorscalibrate_qti_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.soter@1\.0-service u:object_r:hal_soter_qti_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.sensorscalibrate@1\.0-service u:object_r:vendor_hal_sensorscalibrate_qti_default_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.soter@1\.0-service u:object_r:vendor_hal_soter_qti_exec:s0
/vendor/bin/hw/vendor\.qti\.hardware\.vibrator@1\.[0-2]-service u:object_r:hal_vibrator_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.power\.pasrmanager\@1\.0-service u:object_r:hal_pasrmanager_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.power\.pasrmanager\@1\.0-service u:object_r:vendor_hal_pasrmanager_qti_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.secure_element@1\.0-service u:object_r:hal_secure_element_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.perf@2\.0-service u:object_r:hal_perf_default_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.perf@2\.0-service u:object_r:vendor_hal_perf_default_exec:s0
/(vendor|system/vendor)/bin/mm-audio-ftm u:object_r:vendor_audioftm_exec:s0
-/(vendor|system/vendor)/bin/qrtr-ns u:object_r:qrtr_exec:s0
-/(vendor|system/vendor)/bin/spdaemon u:object_r:spdaemon_exec:s0
-/(vendor|system/vendor)/bin/sec_nvm u:object_r:sec_nvm_exec:s0
-/(vendor|system/vendor)/bin/hostapd_cli u:object_r:hostapd_exec:s0
+/(vendor|system/vendor)/bin/qrtr-ns u:object_r:vendor_qrtr_exec:s0
+/(vendor|system/vendor)/bin/spdaemon u:object_r:vendor_spdaemon_exec:s0
+/(vendor|system/vendor)/bin/sec_nvm u:object_r:vendor_sec_nvm_exec:s0
+/(vendor|system/vendor)/bin/hostapd_cli u:object_r:vendor_hostapd_exec:s0
/(vendor|system/vendor)/bin/qcom-system-daemon u:object_r:vendor_qcomsysd_exec:s0
/(vendor|system/vendor)/bin/vppservice u:object_r:vendor_vppservice_exec:s0
-/(vendor|system/vendor)/bin/wifidisplayhalservice u:object_r:wifidisplayhalservice_qti_exec:s0
-/(vendor|system/vendor)/bin/wfdhdcphalservice u:object_r:wfdhdcphalservice_qti_exec:s0
-/(vendor|system/vendor)/bin/wfdvndservice u:object_r:wfdvndservice_exec:s0
-/(vendor|system/vendor)/bin/nqnfcinfo u:object_r:nqnfcinfo_exec:s0
-/(vendor|system/vendor)/bin/ssgqmigd u:object_r:ssgqmigd_exec:s0
-/(vendor|system/vendor)/bin/ssgtzd u:object_r:ssgtzd_exec:s0
-/(vendor|system/vendor)/bin/mlid u:object_r:mlid_exec:s0
-/(vendor|system/vendor)/bin/qdmastatsd u:object_r:qdmastatsd_exec:s0
-/(vendor|system/vendor)/bin/seemp_healthd u:object_r:seemp_health_daemon_exec:s0
-/(vendor|system/vendor)/bin/qfp-daemon u:object_r:qfp-daemon_exec:s0
-/(vendor|system/vendor)/bin/adpl u:object_r:adpl_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.esepowermanager@1\.0-service u:object_r:hal_esepowermanager_qti_exec:s0
-/(vendor|system/vendor)/bin/esepmdaemon u:object_r:esepmdaemon_exec:s0
-/(vendor|system/vendor)/bin/mdm_helper u:object_r:mdm_helper_exec:s0
-/(vendor|system/vendor)/bin/ks u:object_r:mdm_helper_exec:s0
+/(vendor|system/vendor)/bin/wifidisplayhalservice u:object_r:vendor_wifidisplayhalservice_qti_exec:s0
+/(vendor|system/vendor)/bin/wfdhdcphalservice u:object_r:vendor_wfdhdcphalservice_qti_exec:s0
+/(vendor|system/vendor)/bin/wfdvndservice u:object_r:vendor_wfdvndservice_exec:s0
+/(vendor|system/vendor)/bin/nqnfcinfo u:object_r:vendor_nqnfcinfo_exec:s0
+/(vendor|system/vendor)/bin/ssgqmigd u:object_r:vendor_ssgqmigd_exec:s0
+/(vendor|system/vendor)/bin/ssgtzd u:object_r:vendor_ssgtzd_exec:s0
+/(vendor|system/vendor)/bin/mlid u:object_r:vendor_mlid_exec:s0
+/(vendor|system/vendor)/bin/qdmastatsd u:object_r:vendor_qdmastatsd_exec:s0
+/(vendor|system/vendor)/bin/seemp_healthd u:object_r:vendor_seemp_health_daemon_exec:s0
+/(vendor|system/vendor)/bin/qfp-daemon u:object_r:vendor_qfp-daemon_exec:s0
+/(vendor|system/vendor)/bin/adpl u:object_r:vendor_adpl_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.esepowermanager@1\.0-service u:object_r:vendor_hal_esepowermanager_qti_exec:s0
+/(vendor|system/vendor)/bin/esepmdaemon u:object_r:vendor_esepmdaemon_exec:s0
+/(vendor|system/vendor)/bin/mdm_helper u:object_r:vendor_mdm_helper_exec:s0
+/(vendor|system/vendor)/bin/ks u:object_r:vendor_mdm_helper_exec:s0
/(vendor|system/vendor)/bin/mmi u:object_r:vendor_mmi_exec:s0
/(vendor|system/vendor)/bin/mmid u:object_r:vendor_mmi_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.factory@1\.0-service u:object_r:vendor_hal_factory_qti_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.servicetracker@1\.0-service u:object_r:hal_srvctracker_default_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.servicetracker@1\.0-service u:object_r:vendor_hal_srvctracker_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.cvp@1\.0-service u:object_r:vendor_cvp_exec:s0
-/(vendor|system/vendor)/bin/fstman u:object_r:fstman_exec:s0
-/(vendor|system/vendor)/bin/wigighalsvc u:object_r:wigighalsvc_exec:s0
-/(vendor|system/vendor)/bin/wigignpt u:object_r:wigignpt_exec:s0
-/(vendor|system/vendor)/bin/sensingdaemon u:object_r:sensingdaemon_exec:s0
-/vendor/bin/hw/android\.hardware\.usb\@1\.[0-2]-service-qti u:object_r:hal_usb_qti_exec:s0
-/vendor/bin/vendor\.qti\.qspmhal@1\.0-service u:object_r:hal_qspmhal_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.secureprocessor@1\.0-seccam-tee-qti u:object_r:hal_secureprocessor_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.secureprocessor@1\.0-seccam-tee-qti u:object_r:vendor_hal_secureprocessor_qti_exec:s0
+/(vendor|system/vendor)/bin/fstman u:object_r:vendor_fstman_exec:s0
+/(vendor|system/vendor)/bin/wigighalsvc u:object_r:vendor_wigighalsvc_exec:s0
+/(vendor|system/vendor)/bin/wigignpt u:object_r:vendor_wigignpt_exec:s0
+/(vendor|system/vendor)/bin/sensingdaemon u:object_r:vendor_sensingdaemon_exec:s0
+/vendor/bin/hw/android\.hardware\.usb\@1\.[0-2]-service-qti u:object_r:vendor_hal_usb_qti_exec:s0
+/vendor/bin/vendor\.qti\.qspmhal@1\.0-service u:object_r:vendor_hal_qspmhal_default_exec:s0
#### Context for location features
## location daemons and binaries
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.gnss@.*-service u:object_r:hal_gnss_qti_exec:s0
-/(vendor|system/vendor)/bin/xtwifi-inet-agent u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/xtwifi-client u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.seccam@1\.0-service-qti u:object_r:hal_seccam_qti_exec:s0
-/(vendor|system/vendor)/bin/garden_app u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/DR_AP_Service u:object_r:location_exec:s0
-/(vendor|system/vendor)/bin/slim_daemon u:object_r:location_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.gnss@.*-service u:object_r:vendor_hal_gnss_qti_exec:s0
+/(vendor|system/vendor)/bin/xtwifi-inet-agent u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/xtwifi-client u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.seccam@1\.0-service-qti u:object_r:vendor_hal_seccam_qti_exec:s0
+/(vendor|system/vendor)/bin/garden_app u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/DR_AP_Service u:object_r:vendor_location_exec:s0
+/(vendor|system/vendor)/bin/slim_daemon u:object_r:vendor_location_exec:s0
#bluetooth
-/vendor/bin/hw/vendor\.qti\.hardware\.bluetooth_dun@1\.0-service u:object_r:hal_bluetooth_dun_qti_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.bluetooth_dun@1\.0-service u:object_r:vendor_hal_bluetooth_dun_qti_exec:s0
#hvdcp
-/vendor/bin/hvdcp_opti u:object_r:hvdcp_exec:s0
-/vendor/bin/init.qti.chg_policy.sh u:object_r:qti_init_shell_exec:s0
+/vendor/bin/hvdcp_opti u:object_r:vendor_hvdcp_exec:s0
+/vendor/bin/init.qti.chg_policy.sh u:object_r:vendor_qti_init_shell_exec:s0
#perf
-/sys/module/cpu_boost(/.*)? u:object_r:sysfs_cpu_boost:s0
-/sys/module/msm_performance(/.*)? u:object_r:sysfs_msm_perf:s0
-/sys/module/process_reclaim(/.*)? u:object_r:sysfs_process_reclaim:s0
+/sys/module/cpu_boost(/.*)? u:object_r:vendor_sysfs_cpu_boost:s0
+/sys/module/msm_performance(/.*)? u:object_r:vendor_sysfs_msm_perf:s0
+/sys/module/process_reclaim(/.*)? u:object_r:vendor_sysfs_process_reclaim:s0
###################################
# sysfs files
#
-/sys/devices/virtual/net/bond0/bonding/queue_id u:object_r:sysfs_bond0:s0
-/sys/devices/virtual/net/bond0/queues/rx-0/rps_cpus u:object_r:sysfs_bond0:s0
-/sys/devices/virtual/net/bond0/statistics/rx_bytes u:object_r:sysfs_bond0:s0
-/sys/devices/virtual/net/bond0/statistics/tx_bytes u:object_r:sysfs_bond0:s0
+/sys/devices/virtual/net/bond0/queues/rx-0/rps_cpus u:object_r:vendor_sysfs_bond0:s0
+/sys/devices/virtual/net/bond0/statistics/rx_bytes u:object_r:vendor_sysfs_bond0:s0
+/sys/devices/virtual/net/bond0/statistics/tx_bytes u:object_r:vendor_sysfs_bond0:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/fst_link_loss u:object_r:sysfs_wigig:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/thermal_throttling u:object_r:sysfs_wigig:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/snr_thresh u:object_r:sysfs_wigig:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/fst_config u:object_r:sysfs_wigig:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/net/wigig0/queues/rx-0/rps_cpus u:object_r:sysfs_wigig:s0
-/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/net/wigig0/gro_flush_timeout u:object_r:sysfs_wigig:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/fst_link_loss u:object_r:vendor_sysfs_wigig:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/thermal_throttling u:object_r:vendor_sysfs_wigig:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/snr_thresh u:object_r:vendor_sysfs_wigig:s0
+/sys/devices(/platform)?/soc/[a-f0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/wil6210/fst_config u:object_r:vendor_sysfs_wigig:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/net/wigig0/queues/rx-0/rps_cpus u:object_r:vendor_sysfs_wigig:s0
+/sys/devices(/platform)?/soc/[a-z0-9]+\.qcom,pcie/pci[0-9:]+/[0-9:\.]+/[0-9:\.]+/net/wigig0/gro_flush_timeout u:object_r:vendor_sysfs_wigig:s0
-/sys/devices(/platform)?/soc/soc:qcom,gpubw/devfreq/soc:qcom,gpubw(/.*)? u:object_r:sysfs_devfreq:s0
+/sys/devices(/platform)?/soc/soc:qcom,gpubw/devfreq/soc:qcom,gpubw(/.*)? u:object_r:vendor_sysfs_devfreq:s0
###################################
# data files
#
-/data/vendor/iop(/.*)? u:object_r:iop_data_file:s0
-/data/vendor/misc/qti_fp(/.*)? u:object_r:qfp-daemon_data_file:s0
-/data/vendor/wifi(/.*)? u:object_r:wifi_vendor_data_file:s0
-/data/vendor/wifi/sockets(/.*)? u:object_r:wifi_vendor_wpa_socket:s0
-/data/vendor/wifi/wigig_sockets(/.*)? u:object_r:wifi_vendor_wpa_socket:s0
-/data/vendor/wifi/wigig_sockets/wpa_ctrl.* u:object_r:wifi_vendor_wpa_socket:s0
+/data/vendor/iop(/.*)? u:object_r:vendor_iop_data_file:s0
+/data/vendor/misc/qti_fp(/.*)? u:object_r:vendor_qfp-daemon_data_file:s0
+/data/vendor/wifi(/.*)? u:object_r:vendor_wifi_vendor_data_file:s0
+/data/vendor/wifi/sockets(/.*)? u:object_r:vendor_wifi_vendor_wpa_socket:s0
+/data/vendor/wifi/wigig_sockets(/.*)? u:object_r:vendor_wifi_vendor_wpa_socket:s0
+/data/vendor/wifi/wigig_sockets/wpa_ctrl.* u:object_r:vendor_wifi_vendor_wpa_socket:s0
/dev/cam-hyp-intf-[0-9]+ u:object_r:video_device:s0
-/data/vendor/perfd(/.*)? u:object_r:mpctl_data_file:s0
+/data/vendor/perfd(/.*)? u:object_r:vendor_mpctl_data_file:s0
/data/vendor/dataqti(/.*)? u:object_r:vendor_qti_data_file:s0
/data/vendor/qdmastats(/.*)? u:object_r:vendor_qdma_data_file:s0
/data/vendor/qdma(/.*)? u:object_r:vendor_qdma_data_file:s0
/data/vendor/vpp(/.*)? u:object_r:vendor_vpp_data_file:s0
-/data/vendor/wifi/wigig_hostapd(/.*)? u:object_r:wigig_hostapd_socket:s0
-/data/vendor/lm(/.*)? u:object_r:lm_data_file:s0
-/data/vendor/secure_element(/.*)? u:object_r:secure_element_vendor_data_file:s0
-/data/vendor/sensing(/.*)? u:object_r:sensing_vendor_data_file:s0
+/data/vendor/wifi/wigig_hostapd(/.*)? u:object_r:vendor_wigig_hostapd_socket:s0
+/data/vendor/lm(/.*)? u:object_r:vendor_lm_data_file:s0
+/data/vendor/secure_element(/.*)? u:object_r:vendor_secure_element_vendor_data_file:s0
+/data/vendor/sensing(/.*)? u:object_r:vendor_sensing_vendor_data_file:s0
/data/vendor/gaming(/.*)? u:object_r:vendor_qspmhal_data_file:s0
###################################
# persist files
#
-/mnt/vendor/persist/secnvm(/.*)? u:object_r:persist_secnvm_file:s0
-/mnt/vendor/persist/qti_fp(/.*)? u:object_r:persist_qti_fp_file:s0
+/mnt/vendor/persist/secnvm(/.*)? u:object_r:vendor_persist_secnvm_file:s0
+/mnt/vendor/persist/qti_fp(/.*)? u:object_r:vendor_persist_qti_fp_file:s0
/mnt/vendor/persist/FTM_AP(/.*)? u:object_r:vendor_persist_mmi_file:s0
-/mnt/vendor/persist/vpp(/.*)? u:object_r:persist_vpp_file:s0
-/mnt/vendor/persist/hvdcp_opti(/.*)? u:object_r:persist_hvdcp_file:s0
+/mnt/vendor/persist/vpp(/.*)? u:object_r:vendor_persist_vpp_file:s0
+/mnt/vendor/persist/hvdcp_opti(/.*)? u:object_r:vendor_persist_hvdcp_file:s0
# same-process HAL files and their dependencies
#
@@ -198,4 +197,4 @@
/vendor/lib(64)?/vendor.qti.qspmhal@1.0\.so u:object_r:same_process_hal_file:s0
#wifilearner daemon
-/(vendor|system/vendor)/bin/wifilearner u:object_r:wifilearnersvc_exec:s0
+/(vendor|system/vendor)/bin/wifilearner u:object_r:vendor_wifilearnersvc_exec:s0
diff --git a/qva/vendor/common/fstman.te b/qva/vendor/common/fstman.te
index 862b0ba..02e69f2 100644
--- a/qva/vendor/common/fstman.te
+++ b/qva/vendor/common/fstman.te
@@ -25,21 +25,21 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type fstman, domain;
-type fstman_exec, exec_type, vendor_file_type, file_type;
+type vendor_fstman, domain;
+type vendor_fstman_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(fstman)
-net_domain(fstman)
+init_daemon_domain(vendor_fstman)
+net_domain(vendor_fstman)
#use bypass because net_admin capability is needed
-hal_server_domain_bypass(fstman, hal_fstman)
+hal_server_domain_bypass(vendor_fstman, vendor_hal_fstman)
#allows calls between client and server and vice-versa
-binder_call(hal_fstman_client, hal_fstman_server)
-binder_call(hal_fstman_server, hal_fstman_client)
+binder_call(vendor_hal_fstman_client, vendor_hal_fstman_server)
+binder_call(vendor_hal_fstman_server, vendor_hal_fstman_client)
#register hal service, allow hal clients to find the service
-hal_attribute_hwservice(hal_fstman, hal_fstman_hwservice)
+hal_attribute_hwservice(vendor_hal_fstman, vendor_hal_fstman_hwservice)
# fstman requires special network privileges.
# access traffic control (TC) for marking packets to identify from
@@ -48,35 +48,35 @@
# network admin operations mainly on the bonding driver:
# interface up/down, add/remove slave interfaces, set queue parameters
# This requires the net_admin capability.
-allow fstman self:capability { net_admin net_raw };
+allow vendor_fstman self:capability { net_admin net_raw };
# netlink socket is used to access traffic control (TC)
-allow fstman self:netlink_route_socket nlmsg_write;
+allow vendor_fstman self:netlink_route_socket nlmsg_write;
# allow privileged socket operations: interface up/down, bond interface management
-allowxperm fstman self:udp_socket ioctl { SIOCGIFFLAGS SIOCSIFFLAGS SIOCSIFTXQLEN SIOCBONDENSLAVE SIOCBONDRELEASE SIOCETHTOOL SIOCSIFHWADDR };
+allowxperm vendor_fstman self:udp_socket ioctl { SIOCGIFFLAGS SIOCSIFFLAGS SIOCSIFTXQLEN SIOCBONDENSLAVE SIOCBONDRELEASE SIOCETHTOOL SIOCSIFHWADDR };
# need access to bond0 sysfs in order to manage attached interfaces
-allow fstman sysfs_net:dir r_dir_perms;
-allow fstman sysfs_bond0:file rw_file_perms;
+allow vendor_fstman sysfs_net:dir r_dir_perms;
+allow vendor_fstman vendor_sysfs_bond0:file rw_file_perms;
# need access to wigig sysfs in order to control fst_link_loss
-allow fstman sysfs_wigig:file rw_file_perms;
+allow vendor_fstman vendor_sysfs_wigig:file rw_file_perms;
-# create/read fstman configuration file (/data/vendor/wifi/fstman.ini)
-r_dir_file(fstman, wifi_vendor_data_file)
-allow fstman wifi_vendor_data_file:dir rw_dir_perms;
-allow fstman wifi_vendor_data_file:file create_file_perms;
+# create/read vendor_fstman configuration file (/data/vendor/wifi/vendor_fstman.ini)
+r_dir_file(vendor_fstman, vendor_wifi_vendor_data_file)
+allow vendor_fstman vendor_wifi_vendor_data_file:dir rw_dir_perms;
+allow vendor_fstman vendor_wifi_vendor_data_file:file create_file_perms;
-# fstman needs to communicate with wpa_supplicant and hostapd using socket
+# vendor_fstman needs to communicate with wpa_supplicant and hostapd using socket
# for managing FST state
-allow fstman { hal_wifi_supplicant hal_wifi_hostapd_default }:unix_dgram_socket sendto;
+allow vendor_fstman { hal_wifi_supplicant hal_wifi_hostapd_default }:unix_dgram_socket sendto;
# supplicant interface sockets
-allow fstman wifi_vendor_wpa_socket:dir rw_dir_perms;
-allow fstman wifi_vendor_wpa_socket:sock_file create_file_perms;
-allow fstman wigig_vendor_wpa_socket:sock_file rw_file_perms;
+allow vendor_fstman vendor_wifi_vendor_wpa_socket:dir rw_dir_perms;
+allow vendor_fstman vendor_wifi_vendor_wpa_socket:sock_file create_file_perms;
+allow vendor_fstman vendor_wigig_vendor_wpa_socket:sock_file rw_file_perms;
# hostapd global socket
-allow fstman hostapd_data_file:dir rw_dir_perms;
-allow fstman hostapd_data_file:sock_file create_file_perms;
+allow vendor_fstman hostapd_data_file:dir rw_dir_perms;
+allow vendor_fstman hostapd_data_file:sock_file create_file_perms;
# access capability config store
-hal_client_domain(fstman, hal_capabilityconfigstore_qti);
+hal_client_domain(vendor_fstman, vendor_hal_capabilityconfigstore_qti);
diff --git a/qva/vendor/common/genfs_contexts b/qva/vendor/common/genfs_contexts
index d3d6aa8..df312ef 100644
--- a/qva/vendor/common/genfs_contexts
+++ b/qva/vendor/common/genfs_contexts
@@ -25,19 +25,19 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-genfscon sysfs /devices/virtual/npu/msm_npu/pwr u:object_r:sysfs_npu:s0
-genfscon sysfs /devices/virtual/fts/touch_aoi u:object_r:sysfs_touch_aoi:s0
-genfscon proc /asound/card0/state u:object_r:proc_audiod:s0
-genfscon proc /asound/cards u:object_r:proc_audiod:s0
-genfscon sysfs /module/msm_thermal/core_control/cpus_offlined u:object_r:sysfs_mpctl:s0
+genfscon sysfs /devices/virtual/npu/msm_npu/pwr u:object_r:vendor_sysfs_npu:s0
+genfscon sysfs /devices/virtual/fts/touch_aoi u:object_r:vendor_sysfs_touch_aoi:s0
+genfscon proc /asound/card0/state u:object_r:vendor_proc_audiod:s0
+genfscon proc /asound/cards u:object_r:vendor_proc_audiod:s0
+genfscon sysfs /module/msm_thermal/core_control/cpus_offlined u:object_r:vendor_sysfs_mpctl:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon0/name u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon0/cable.0/ u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon0/name u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon0/cable.0/ u:object_r:vendor_sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon1/name u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon1/cable.0/ u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon1/name u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon1/cable.0/ u:object_r:vendor_sysfs_graphics:s0
-genfscon sysfs /module/rmnet_perf/parameters u:object_r:sysfs_rmnet:s0
+genfscon sysfs /module/rmnet_perf/parameters u:object_r:vendor_sysfs_rmnet:s0
-genfscon sysfs /kernel/qvr_external_sensor u:object_r:sysfs_qvr_external_sensor:s0
-genfscon sysfs /devices/system/memory/ u:object_r:sysfs_memory_offline:s0
+genfscon sysfs /kernel/qvr_external_sensor u:object_r:vendor_sysfs_qvr_external_sensor:s0
+genfscon sysfs /devices/system/memory/ u:object_r:vendor_sysfs_memory_offline:s0
diff --git a/generic/vendor/common/hal_alarm_qti.te b/qva/vendor/common/hal_alarm_qti.te
similarity index 83%
rename from generic/vendor/common/hal_alarm_qti.te
rename to qva/vendor/common/hal_alarm_qti.te
index ec79386..b6fa514 100755
--- a/generic/vendor/common/hal_alarm_qti.te
+++ b/qva/vendor/common/hal_alarm_qti.te
@@ -26,9 +26,9 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(hal_alarm_qti_client, hal_alarm_qti_server)
-binder_call(hal_alarm_qti_server, hal_alarm_qti_client)
+binder_call(vendor_hal_alarm_qti_client, vendor_hal_alarm_qti_server)
+binder_call(vendor_hal_alarm_qti_server, vendor_hal_alarm_qti_client)
-add_hwservice(hal_alarm_qti_server, hal_alarm_qti_hwservice)
+add_hwservice(vendor_hal_alarm_qti_server, vendor_hal_alarm_qti_hwservice)
-allow hal_alarm_qti_client hal_alarm_qti_hwservice:hwservice_manager find;
+allow vendor_hal_alarm_qti_client vendor_hal_alarm_qti_hwservice:hwservice_manager find;
diff --git a/qva/vendor/common/hal_audio.te b/qva/vendor/common/hal_audio.te
index 456914e..2a38db9 100644
--- a/qva/vendor/common/hal_audio.te
+++ b/qva/vendor/common/hal_audio.te
@@ -28,8 +28,8 @@
userdebug_or_eng(`
diag_use(hal_audio)
#Allow access to debug fs
- allow hal_audio_default qti_debugfs:dir r_dir_perms;
- allow hal_audio_default qti_debugfs:file rw_file_perms;
+ allow hal_audio_default vendor_qti_debugfs:dir r_dir_perms;
+ allow hal_audio_default vendor_qti_debugfs:file rw_file_perms;
')
#Split A2dp specific
diff --git a/qva/vendor/common/hal_bluetooth_default.te b/qva/vendor/common/hal_bluetooth_default.te
index b5b03e9..39687d4 100644
--- a/qva/vendor/common/hal_bluetooth_default.te
+++ b/qva/vendor/common/hal_bluetooth_default.te
@@ -25,5 +25,5 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_server_domain(hal_bluetooth_default, hal_fm)
-hal_server_domain(hal_bluetooth_default, hal_btconfigstore)
\ No newline at end of file
+hal_server_domain(hal_bluetooth_default, vendor_hal_fm)
+hal_server_domain(hal_bluetooth_default, vendor_hal_btconfigstore)
diff --git a/qva/vendor/common/hal_bluetooth_dun.te b/qva/vendor/common/hal_bluetooth_dun.te
index 408f0d3..8cdf4f2 100644
--- a/qva/vendor/common/hal_bluetooth_dun.te
+++ b/qva/vendor/common/hal_bluetooth_dun.te
@@ -25,14 +25,14 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_bluetooth_dun_qti, domain;
-hal_server_domain(hal_bluetooth_dun_qti, hal_bluetooth_dun)
+type vendor_hal_bluetooth_dun_qti, domain;
+hal_server_domain(vendor_hal_bluetooth_dun_qti, vendor_hal_bluetooth_dun)
-type hal_bluetooth_dun_qti_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_bluetooth_dun_qti)
+type vendor_hal_bluetooth_dun_qti_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_bluetooth_dun_qti)
-binder_call(hal_bluetooth_dun_client, hal_bluetooth_dun_server)
-binder_call(hal_bluetooth_dun_server, hal_bluetooth_dun_client)
-hal_attribute_hwservice(hal_bluetooth_dun, hal_bluetooth_dun_hwservice)
+binder_call(vendor_hal_bluetooth_dun_client, vendor_hal_bluetooth_dun_server)
+binder_call(vendor_hal_bluetooth_dun_server, vendor_hal_bluetooth_dun_client)
+hal_attribute_hwservice(vendor_hal_bluetooth_dun, vendor_hal_bluetooth_dun_hwservice)
-portbridge_socket(hal_bluetooth_dun_qti)
+portbridge_socket(vendor_hal_bluetooth_dun_qti)
diff --git a/qva/vendor/common/hal_btconfigstore.te b/qva/vendor/common/hal_btconfigstore.te
index 05b2a2a..8152350 100644
--- a/qva/vendor/common/hal_btconfigstore.te
+++ b/qva/vendor/common/hal_btconfigstore.te
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(hal_btconfigstore_client, hal_btconfigstore_server)
-binder_call(hal_btconfigstore_server, hal_btconfigstore_client)
-hal_attribute_hwservice(hal_btconfigstore, hal_btconfigstore_hwservice)
+binder_call(vendor_hal_btconfigstore_client, vendor_hal_btconfigstore_server)
+binder_call(vendor_hal_btconfigstore_server, vendor_hal_btconfigstore_client)
+hal_attribute_hwservice(vendor_hal_btconfigstore, vendor_hal_btconfigstore_hwservice)
diff --git a/qva/vendor/common/hal_camera.te b/qva/vendor/common/hal_camera.te
index 004eba2..08b6a24 100644
--- a/qva/vendor/common/hal_camera.te
+++ b/qva/vendor/common/hal_camera.te
@@ -28,10 +28,10 @@
allow hal_camera self:qipcrtr_socket create_socket_perms;
allowxperm hal_camera self:qipcrtr_socket ioctl msm_sock_ipc_ioctls;
-hal_client_domain(hal_camera_default, hal_vpp)
+hal_client_domain(hal_camera_default, vendor_hal_vpp)
allow hal_camera gpu_device:chr_file rw_file_perms;
-allow hal_camera sysfs_jpeg:file r_file_perms;
+allow hal_camera vendor_sysfs_jpeg:file r_file_perms;
-allow hal_camera qdisplay_service:service_manager find;
\ No newline at end of file
+allow hal_camera vendor_qdisplay_service:service_manager find;
diff --git a/qva/vendor/common/hal_configstore.te b/qva/vendor/common/hal_configstore.te
index 9c7adf3..688ae3e 100644
--- a/qva/vendor/common/hal_configstore.te
+++ b/qva/vendor/common/hal_configstore.te
@@ -26,6 +26,6 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# allow configstore client to find display config service.
-allow hal_configstore_default hal_display_config_hwservice:hwservice_manager find;
+allow hal_configstore_default vendor_hal_display_config_hwservice:hwservice_manager find;
binder_call(hal_configstore_default, hal_graphics_composer_default)
diff --git a/qva/vendor/common/hal_cvp.te b/qva/vendor/common/hal_cvp.te
index 3d3bb10..3cb9502 100644
--- a/qva/vendor/common/hal_cvp.te
+++ b/qva/vendor/common/hal_cvp.te
@@ -30,14 +30,14 @@
init_daemon_domain(vendor_cvp)
-hal_server_domain(vendor_cvp, hal_cvp)
+hal_server_domain(vendor_cvp, vendor_hal_cvp)
-add_hwservice(hal_cvp_server, hal_cvp_hwservice)
+add_hwservice(vendor_hal_cvp_server, vendor_hal_cvp_hwservice)
-allow hal_cvp_client hal_cvp_hwservice:hwservice_manager find;
+allow vendor_hal_cvp_client vendor_hal_cvp_hwservice:hwservice_manager find;
-binder_call(hal_cvp_client, hal_cvp_server)
-binder_call(hal_cvp_server, hal_cvp_client)
+binder_call(vendor_hal_cvp_client, vendor_hal_cvp_server)
+binder_call(vendor_hal_cvp_server, vendor_hal_cvp_client)
r_dir_file(vendor_cvp, adsprpcd_file)
@@ -45,8 +45,8 @@
allow vendor_cvp ion_device:chr_file rw_file_perms;
# Access for DSP/QDSP device
-allow vendor_cvp qdsp_device:chr_file rw_file_perms;
-allow vendor_cvp dsp_device:chr_file rw_file_perms;
+allow vendor_cvp vendor_qdsp_device:chr_file rw_file_perms;
+allow vendor_cvp vendor_dsp_device:chr_file rw_file_perms;
# Access for sdcard
userdebug_or_eng(`
diff --git a/qva/vendor/common/hal_dpmQmiMgr.te b/qva/vendor/common/hal_dpmQmiMgr.te
index 094b540..4734734 100755
--- a/qva/vendor/common/hal_dpmQmiMgr.te
+++ b/qva/vendor/common/hal_dpmQmiMgr.te
@@ -26,40 +26,40 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#dpmQmiMgr as domain
-type hal_dpmQmiMgr, domain;
-type hal_dpmQmiMgr_exec, exec_type, vendor_file_type, file_type;
+type vendor_hal_dpmQmiMgr, domain;
+type vendor_hal_dpmQmiMgr_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_dpmQmiMgr)
+init_daemon_domain(vendor_hal_dpmQmiMgr)
-net_domain(hal_dpmQmiMgr)
+net_domain(vendor_hal_dpmQmiMgr)
#Add hal_dpmQMiMgr as hwservice
-add_hwservice(hal_dpmQmiMgr, hal_dpmqmi_hwservice)
+add_hwservice(vendor_hal_dpmQmiMgr, vendor_hal_dpmqmi_hwservice)
#Allow hwbinder usage
-hwbinder_use(hal_dpmQmiMgr)
+hwbinder_use(vendor_hal_dpmQmiMgr)
#Allow to get hwservice_prop
-get_prop(hal_dpmQmiMgr, hwservicemanager_prop)
+get_prop(vendor_hal_dpmQmiMgr, hwservicemanager_prop)
#Allow binder call from dpmd
-binder_call(hal_dpmQmiMgr,dpmd)
+binder_call(vendor_hal_dpmQmiMgr,dpmd)
#sysfs_data file permissions
-allow hal_dpmQmiMgr sysfs_data:file r_file_perms;
+allow vendor_hal_dpmQmiMgr vendor_sysfs_data:file r_file_perms;
#Allow reading proc/net entries
-r_dir_file(hal_dpmQmiMgr,proc_net)
-r_dir_file(hal_dpmQmiMgr,proc_net_tcp_udp)
+r_dir_file(vendor_hal_dpmQmiMgr,proc_net)
+r_dir_file(vendor_hal_dpmQmiMgr,proc_net_tcp_udp)
#Allow creating socket and IOCTLs
-allow hal_dpmQmiMgr self:{ socket qipcrtr_socket udp_socket } create_socket_perms_no_ioctl;
+allow vendor_hal_dpmQmiMgr self:{ socket qipcrtr_socket udp_socket } create_socket_perms_no_ioctl;
#Rules below are needed to communicate with IPC_ROUTER for QMI
-allowxperm hal_dpmQmiMgr self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
-allow hal_dpmQmiMgr self:capability net_bind_service;
-allowxperm hal_dpmQmiMgr self:udp_socket ioctl priv_sock_ioctls;
+allowxperm vendor_hal_dpmQmiMgr self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+allow vendor_hal_dpmQmiMgr self:capability net_bind_service;
+allowxperm vendor_hal_dpmQmiMgr self:udp_socket ioctl priv_sock_ioctls;
userdebug_or_eng(`
- diag_use(hal_dpmQmiMgr)
+ diag_use(vendor_hal_dpmQmiMgr)
')
diff --git a/qva/vendor/common/hal_drm_clearkey.te b/qva/vendor/common/hal_drm_clearkey.te
index 95c81b0..6006462 100644
--- a/qva/vendor/common/hal_drm_clearkey.te
+++ b/qva/vendor/common/hal_drm_clearkey.te
@@ -26,10 +26,10 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# policy for /vendor/bin/hw/android.hardware.drm@1.1-service.clearkey
-type hal_drm_clearkey, domain;
-type hal_drm_clearkey_exec, exec_type, vendor_file_type, file_type;
+type vendor_hal_drm_clearkey, domain;
+type vendor_hal_drm_clearkey_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_drm_clearkey)
+init_daemon_domain(vendor_hal_drm_clearkey)
-hal_server_domain(hal_drm_clearkey, hal_drm)
-vndbinder_use(hal_drm_clearkey);
+hal_server_domain(vendor_hal_drm_clearkey, hal_drm)
+vndbinder_use(vendor_hal_drm_clearkey);
diff --git a/qva/vendor/common/hal_esepowermanager_qti.te b/qva/vendor/common/hal_esepowermanager_qti.te
index 05ca667..6b7d1a0 100644
--- a/qva/vendor/common/hal_esepowermanager_qti.te
+++ b/qva/vendor/common/hal_esepowermanager_qti.te
@@ -25,33 +25,33 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_esepowermanager_qti, domain;
-hal_server_domain(hal_esepowermanager_qti, hal_esepowermanager)
+type vendor_hal_esepowermanager_qti, domain;
+hal_server_domain(vendor_hal_esepowermanager_qti, vendor_hal_esepowermanager)
-type hal_esepowermanager_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_esepowermanager_qti)
+type vendor_hal_esepowermanager_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_esepowermanager_qti)
-hwbinder_use(hal_esepowermanager_qti)
-add_hwservice(hal_esepowermanager_qti, hal_esepowermanager_hwservice)
+hwbinder_use(vendor_hal_esepowermanager_qti)
+add_hwservice(vendor_hal_esepowermanager_qti, vendor_hal_esepowermanager_hwservice)
-hal_client_domain(hal_esepowermanager_qti, hal_allocator)
+hal_client_domain(vendor_hal_esepowermanager_qti, hal_allocator)
#Allow access to nfc device
-allow hal_esepowermanager_qti {
+allow vendor_hal_esepowermanager_qti {
nfc_device
}:chr_file rw_file_perms;
# allow esepmdaemon to load firmware images
-r_dir_file(hal_esepowermanager_qti, firmware_file)
+r_dir_file(vendor_hal_esepowermanager_qti, firmware_file)
# Allow esepmdaemon to interract with ion_device
-allow hal_esepowermanager_qti ion_device:chr_file r_file_perms;
+allow vendor_hal_esepowermanager_qti ion_device:chr_file r_file_perms;
# Allow esepmdaemon to interract with qseecom
-allow hal_esepowermanager_qti tee_device:chr_file rw_file_perms;
+allow vendor_hal_esepowermanager_qti tee_device:chr_file rw_file_perms;
#Allow hal_esepowermanager_client client domain apps to find hwservice
-binder_call(hal_esepowermanager_client, hal_esepowermanager_server)
-binder_call(hal_esepowermanager_server, hal_esepowermanager_client)
+binder_call(vendor_hal_esepowermanager_client, vendor_hal_esepowermanager_server)
+binder_call(vendor_hal_esepowermanager_server, vendor_hal_esepowermanager_client)
-allow hal_esepowermanager_client hal_esepowermanager_hwservice:hwservice_manager find;
+allow vendor_hal_esepowermanager_client vendor_hal_esepowermanager_hwservice:hwservice_manager find;
diff --git a/qva/vendor/common/hal_factory_qti_default.te b/qva/vendor/common/hal_factory_qti_default.te
index fbbba0c..0de46e1 100755
--- a/qva/vendor/common/hal_factory_qti_default.te
+++ b/qva/vendor/common/hal_factory_qti_default.te
@@ -31,7 +31,7 @@
type vendor_hal_factory_qti_default_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(vendor_hal_factory_qti_default)
-set_prop(vendor_hal_factory_qti, ctl_vendor_mmid_prop)
+set_prop(vendor_hal_factory_qti, vendor_ctl_vendor_mmid_prop)
# Allow read/write to mmi socket
allow vendor_hal_factory_qti vendor_mmi_socket:sock_file rw_file_perms;
@@ -41,4 +41,4 @@
allow vendor_hal_factory_qti_default vendor_persist_mmi_file:file create_file_perms;
# Allow set vendor.sys.boot_mode property
-set_prop(vendor_hal_factory_qti_default, vendor_boot_mode_prop);
\ No newline at end of file
+set_prop(vendor_hal_factory_qti_default, vendor_boot_mode_prop);
diff --git a/qva/vendor/common/hal_fm.te b/qva/vendor/common/hal_fm.te
index 98a96a4..b497613 100644
--- a/qva/vendor/common/hal_fm.te
+++ b/qva/vendor/common/hal_fm.te
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(hal_fm_client, hal_fm_server)
-binder_call(hal_fm_server, hal_fm_client)
-hal_attribute_hwservice(hal_fm, hal_fm_hwservice)
+binder_call(vendor_hal_fm_client, vendor_hal_fm_server)
+binder_call(vendor_hal_fm_server, vendor_hal_fm_client)
+hal_attribute_hwservice(vendor_hal_fm, vendor_hal_fm_hwservice)
diff --git a/qva/vendor/common/hal_gatekeeper_qti.te b/qva/vendor/common/hal_gatekeeper_qti.te
index 4f0b2b4..c0bace3 100644
--- a/qva/vendor/common/hal_gatekeeper_qti.te
+++ b/qva/vendor/common/hal_gatekeeper_qti.te
@@ -26,13 +26,13 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# allow access to /dev/spcom
-allow hal_gatekeeper_qti spcom_device:chr_file rw_file_perms;
+allow vendor_hal_gatekeeper_qti vendor_spcom_device:chr_file rw_file_perms;
# allow access to skp
-allow hal_gatekeeper_qti skp_device:chr_file rw_file_perms;
+allow vendor_hal_gatekeeper_qti vendor_skp_device:chr_file rw_file_perms;
-allow hal_gatekeeper_qti sp_keymaster_device:chr_file rw_file_perms;
-allow hal_gatekeeper_qti sp_ssr_device:chr_file rw_file_perms;
-get_prop(hal_gatekeeper_qti, spcomlib_prop)
+allow vendor_hal_gatekeeper_qti vendor_sp_keymaster_device:chr_file rw_file_perms;
+allow vendor_hal_gatekeeper_qti vendor_sp_ssr_device:chr_file rw_file_perms;
+get_prop(vendor_hal_gatekeeper_qti, vendor_spcomlib_prop)
-get_prop(hal_gatekeeper_qti, vendor_disable_spu_prop)
+get_prop(vendor_hal_gatekeeper_qti, vendor_disable_spu_prop)
diff --git a/qva/vendor/common/hal_gnss_qti.te b/qva/vendor/common/hal_gnss_qti.te
index ffb3b4e..7a89407 100644
--- a/qva/vendor/common/hal_gnss_qti.te
+++ b/qva/vendor/common/hal_gnss_qti.te
@@ -25,11 +25,11 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# qva/hal_gnss_qti.te - generic sepolicy rules for qti value added
+# qva/vendor_hal_gnss_qti.te - generic sepolicy rules for qti value added
# location hidl
userdebug_or_eng(`
- get_prop(hal_gnss_qti, vendor_pd_locater_dbg_prop)
+ get_prop(vendor_hal_gnss_qti, vendor_pd_locater_dbg_prop)
')
-allow hal_gnss self:qipcrtr_socket create_socket_perms_no_ioctl;
\ No newline at end of file
+allow hal_gnss self:qipcrtr_socket create_socket_perms_no_ioctl;
diff --git a/qva/vendor/common/hal_iop_default.te b/qva/vendor/common/hal_iop_default.te
index e09440c..0e016a5 100644
--- a/qva/vendor/common/hal_iop_default.te
+++ b/qva/vendor/common/hal_iop_default.te
@@ -25,27 +25,27 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_iop_default, domain, mlstrustedsubject;
-hal_server_domain(hal_iop_default, hal_iop)
+type vendor_hal_iop_default, domain, mlstrustedsubject;
+hal_server_domain(vendor_hal_iop_default, vendor_hal_iop)
-type hal_iop_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_iop_default)
+type vendor_hal_iop_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_iop_default)
# Allow hwbinder call from hal client to server
-binder_call(hal_iop_client, hal_iop_server)
+binder_call(vendor_hal_iop_client, vendor_hal_iop_server)
# Add hwservice related rules
-add_hwservice(hal_iop_server, hal_iop_hwservice)
-allow hal_iop_client hal_iop_hwservice:hwservice_manager find;
-allow hal_iop_client hal_perf_hwservice:hwservice_manager find;
+add_hwservice(vendor_hal_iop_server, vendor_hal_iop_hwservice)
+allow vendor_hal_iop_client vendor_hal_iop_hwservice:hwservice_manager find;
+allow vendor_hal_iop_client vendor_hal_perf_hwservice:hwservice_manager find;
#Allow access for vendor property
-get_prop(hal_iop, vendor_iop_prop)
-get_prop(hal_iop, vendor_mpctl_prop)
+get_prop(vendor_hal_iop, vendor_iop_prop)
+get_prop(vendor_hal_iop, vendor_mpctl_prop)
# Allow access for /proc
-allow hal_iop_default proc:file r_file_perms;
+allow vendor_hal_iop_default proc:file r_file_perms;
#Allow Access for /data/vendor/iop
-allow hal_iop iop_data_file:dir rw_dir_perms;
-allow hal_iop iop_data_file:file create_file_perms;
-hal_client_domain(hal_iop_default, hal_perf)
+allow vendor_hal_iop vendor_iop_data_file:dir rw_dir_perms;
+allow vendor_hal_iop vendor_iop_data_file:file create_file_perms;
+hal_client_domain(vendor_hal_iop_default, vendor_hal_perf)
diff --git a/qva/vendor/common/hal_keymaster_qti.te b/qva/vendor/common/hal_keymaster_qti.te
index eceac8a..efa1d9c 100644
--- a/qva/vendor/common/hal_keymaster_qti.te
+++ b/qva/vendor/common/hal_keymaster_qti.te
@@ -26,11 +26,11 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# allow access to /dev/spcom
-allow hal_keymaster_qti spcom_device:chr_file rw_file_perms;
+allow vendor_hal_keymaster_qti vendor_spcom_device:chr_file rw_file_perms;
# allow access to skp
-allow hal_keymaster_qti skp_device:chr_file rw_file_perms;
+allow vendor_hal_keymaster_qti vendor_skp_device:chr_file rw_file_perms;
-allow hal_keymaster_qti sp_keymaster_device:chr_file rw_file_perms;
-allow hal_keymaster_qti sp_ssr_device:chr_file rw_file_perms;
-get_prop(hal_keymaster_qti, spcomlib_prop)
+allow vendor_hal_keymaster_qti vendor_sp_keymaster_device:chr_file rw_file_perms;
+allow vendor_hal_keymaster_qti vendor_sp_ssr_device:chr_file rw_file_perms;
+get_prop(vendor_hal_keymaster_qti, vendor_spcomlib_prop)
diff --git a/qva/vendor/common/hal_memtrack.te b/qva/vendor/common/hal_memtrack.te
index 0143f8c..da3fc77 100644
--- a/qva/vendor/common/hal_memtrack.te
+++ b/qva/vendor/common/hal_memtrack.te
@@ -27,6 +27,6 @@
#debugfs access to audio
userdebug_or_eng(`
-allow hal_memtrack_default qti_debugfs:dir r_dir_perms;
-allow hal_memtrack_default qti_debugfs:file rw_file_perms;
+allow hal_memtrack_default vendor_qti_debugfs:dir r_dir_perms;
+allow hal_memtrack_default vendor_qti_debugfs:file rw_file_perms;
')
diff --git a/qva/vendor/common/hal_nfc_default.te b/qva/vendor/common/hal_nfc_default.te
index 81f4acd..fb447a5 100644
--- a/qva/vendor/common/hal_nfc_default.te
+++ b/qva/vendor/common/hal_nfc_default.te
@@ -32,4 +32,4 @@
#Allow access to firmware
r_dir_file(hal_nfc_default, firmware_file)
-allow hal_nfc_default nfc_vendor_data_file:file rw_file_perms;
+allow hal_nfc_default vendor_nfc_vendor_data_file:file rw_file_perms;
diff --git a/qva/vendor/common/hal_pasrmanager.te b/qva/vendor/common/hal_pasrmanager.te
index 8897a95..86b5b11 100644
--- a/qva/vendor/common/hal_pasrmanager.te
+++ b/qva/vendor/common/hal_pasrmanager.te
@@ -26,15 +26,15 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#Define Domain
-type hal_pasrmanager_qti, domain;
-type hal_pasrmanager_qti_exec, exec_type, vendor_file_type, file_type;
-hal_server_domain(hal_pasrmanager_qti, hal_pasrmanager)
-init_daemon_domain(hal_pasrmanager_qti)
-binder_call(hal_pasrmanager_client, hal_pasrmanager_server)
+type vendor_hal_pasrmanager_qti, domain;
+type vendor_hal_pasrmanager_qti_exec, exec_type, vendor_file_type, file_type;
+hal_server_domain(vendor_hal_pasrmanager_qti, vendor_hal_pasrmanager)
+init_daemon_domain(vendor_hal_pasrmanager_qti)
+binder_call(vendor_hal_pasrmanager_client, vendor_hal_pasrmanager_server)
-add_hwservice(hal_pasrmanager_server, hal_pasrmanager_hwservice)
-allow hal_pasrmanager_client hal_pasrmanager_hwservice:hwservice_manager find;
+add_hwservice(vendor_hal_pasrmanager_server, vendor_hal_pasrmanager_hwservice)
+allow vendor_hal_pasrmanager_client vendor_hal_pasrmanager_hwservice:hwservice_manager find;
-allow hal_pasrmanager_qti sysfs:dir r_dir_perms;
-allow hal_pasrmanager_qti sysfs_memory_offline:file rw_file_perms;
-allow hal_pasrmanager_qti sysfs_memory_offline:dir r_dir_perms;
+allow vendor_hal_pasrmanager_qti sysfs:dir r_dir_perms;
+allow vendor_hal_pasrmanager_qti vendor_sysfs_memory_offline:file rw_file_perms;
+allow vendor_hal_pasrmanager_qti vendor_sysfs_memory_offline:dir r_dir_perms;
diff --git a/qva/vendor/common/hal_perf_default.te b/qva/vendor/common/hal_perf_default.te
index e44d824..571cc11 100644
--- a/qva/vendor/common/hal_perf_default.te
+++ b/qva/vendor/common/hal_perf_default.te
@@ -25,74 +25,74 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_perf_default, domain, mlstrustedsubject;
-hal_server_domain_bypass(hal_perf_default, hal_perf)
+type vendor_hal_perf_default, domain, mlstrustedsubject;
+hal_server_domain_bypass(vendor_hal_perf_default, vendor_hal_perf)
-type hal_perf_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_perf_default)
+type vendor_hal_perf_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_perf_default)
# Allow hwbinder call from hal client to server
-binder_call(hal_perf_client, hal_perf_server)
+binder_call(vendor_hal_perf_client, vendor_hal_perf_server)
# Add hwservice related rules
-add_hwservice(hal_perf_server, hal_perf_hwservice)
-allow hal_perf_client hal_perf_hwservice:hwservice_manager find;
+add_hwservice(vendor_hal_perf_server, vendor_hal_perf_hwservice)
+allow vendor_hal_perf_client vendor_hal_perf_hwservice:hwservice_manager find;
-allow hal_perf_default cgroup:file r_file_perms;
-allow hal_perf_default proc:file rw_file_perms;
-allow hal_perf latency_device:chr_file rw_file_perms;
-get_prop(hal_perf, freq_prop)
-get_prop(hal_perf, vendor_mpctl_prop)
-allow hal_perf_default mpctl_data_file:dir rw_dir_perms;
-allow hal_perf_default mpctl_data_file:file create_file_perms;
-allow hal_perf_default lm_data_file:dir rw_dir_perms;
-allow hal_perf_default lm_data_file:file create_file_perms;
-allow hal_perf_default sysfs_lib:file w_file_perms;
-r_dir_file(hal_perf_default, appdomain);
-allow hal_perf_default {appdomain}:file rw_file_perms;
+allow vendor_hal_perf_default cgroup:file r_file_perms;
+allow vendor_hal_perf_default proc:file rw_file_perms;
+allow vendor_hal_perf vendor_latency_device:chr_file rw_file_perms;
+get_prop(vendor_hal_perf, vendor_freq_prop)
+get_prop(vendor_hal_perf, vendor_mpctl_prop)
+allow vendor_hal_perf_default vendor_mpctl_data_file:dir rw_dir_perms;
+allow vendor_hal_perf_default vendor_mpctl_data_file:file create_file_perms;
+allow vendor_hal_perf_default vendor_lm_data_file:dir rw_dir_perms;
+allow vendor_hal_perf_default vendor_lm_data_file:file create_file_perms;
+allow vendor_hal_perf_default vendor_sysfs_lib:file w_file_perms;
+r_dir_file(vendor_hal_perf_default, appdomain);
+allow vendor_hal_perf_default {appdomain}:file rw_file_perms;
-allow hal_perf {
+allow vendor_hal_perf {
sysfs_devices_system_cpu
- sysfs_mpctl
- sysfs_devfreq
- sysfs_mmc_host
- sysfs_scsi_host
- sysfs_kgsl
- sysfs_cpu_boost
- sysfs_msm_perf
- sysfs_memory
- sysfs_graphics
- sysfs_msm_power
- sysfs_battery_supply
- sysfs_process_reclaim
- sysfs_qfprom
+ vendor_sysfs_mpctl
+ vendor_sysfs_devfreq
+ vendor_sysfs_mmc_host
+ vendor_sysfs_scsi_host
+ vendor_sysfs_kgsl
+ vendor_sysfs_cpu_boost
+ vendor_sysfs_msm_perf
+ vendor_sysfs_memory
+ vendor_sysfs_graphics
+ vendor_sysfs_msm_power
+ vendor_sysfs_battery_supply
+ vendor_sysfs_process_reclaim
+ vendor_sysfs_qfprom
}:dir r_dir_perms;
-allow hal_perf {
+allow vendor_hal_perf {
sysfs_devices_system_cpu
- sysfs_mpctl
- sysfs_cpu_boost
- sysfs_msm_perf
- sysfs_kgsl
- sysfs_cpu_boost
- sysfs_msm_perf
- sysfs_memory
- sysfs_graphics
- sysfs_scsi_host
- sysfs_devfreq
- sysfs_mmc_host
- sysfs_msm_power
- sysfs_battery_supply
- sysfs_process_reclaim
- sysfs_qfprom
+ vendor_sysfs_mpctl
+ vendor_sysfs_cpu_boost
+ vendor_sysfs_msm_perf
+ vendor_sysfs_kgsl
+ vendor_sysfs_cpu_boost
+ vendor_sysfs_msm_perf
+ vendor_sysfs_memory
+ vendor_sysfs_graphics
+ vendor_sysfs_scsi_host
+ vendor_sysfs_devfreq
+ vendor_sysfs_mmc_host
+ vendor_sysfs_msm_power
+ vendor_sysfs_battery_supply
+ vendor_sysfs_process_reclaim
+ vendor_sysfs_qfprom
}:file rw_file_perms;
-allow hal_perf {
- sysfs_devfreq
- sysfs_mmc_host
- sysfs_scsi_host
- sysfs_kgsl
+allow vendor_hal_perf {
+ vendor_sysfs_devfreq
+ vendor_sysfs_mmc_host
+ vendor_sysfs_scsi_host
+ vendor_sysfs_kgsl
}:lnk_file r_file_perms;
# Allow to self kill capability
-allow hal_perf_default self:capability { kill };
+allow vendor_hal_perf_default self:capability { kill };
diff --git a/qva/vendor/common/hal_qteeconnector_qti.te b/qva/vendor/common/hal_qteeconnector_qti.te
index 0210039..209c8eb 100644
--- a/qva/vendor/common/hal_qteeconnector_qti.te
+++ b/qva/vendor/common/hal_qteeconnector_qti.te
@@ -26,37 +26,37 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define the type
-type hal_qteeconnector_qti, domain;
+type vendor_hal_qteeconnector_qti, domain;
#mark the type as hal_server_domain
-hal_server_domain(hal_qteeconnector_qti, hal_qteeconnector)
+hal_server_domain(vendor_hal_qteeconnector_qti, vendor_hal_qteeconnector)
#allow the service to be started by init
-type hal_qteeconnector_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_qteeconnector_qti)
+type vendor_hal_qteeconnector_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_qteeconnector_qti)
#allow the service to be added to hwservice list
-add_hwservice(hal_qteeconnector_qti, hal_qteeconnector_hwservice)
+add_hwservice(vendor_hal_qteeconnector_qti, vendor_hal_qteeconnector_hwservice)
#allow access to hal_allocator
-hal_client_domain(hal_qteeconnector_qti, hal_allocator)
+hal_client_domain(vendor_hal_qteeconnector_qti, hal_allocator)
#allow access to ion device
-allow hal_qteeconnector ion_device:chr_file rw_file_perms;
+allow vendor_hal_qteeconnector ion_device:chr_file rw_file_perms;
#allow access to and use of graphics allocator
-hal_client_domain(hal_qteeconnector_qti, hal_graphics_allocator)
+hal_client_domain(vendor_hal_qteeconnector_qti, hal_graphics_allocator)
#Allow access to tee device
-allow hal_qteeconnector_qti tee_device:chr_file rw_file_perms;
+allow vendor_hal_qteeconnector_qti tee_device:chr_file rw_file_perms;
#Allow access to firmware
-allow hal_qteeconnector firmware_file:dir r_dir_perms;
-allow hal_qteeconnector firmware_file:file r_file_perms;
+allow vendor_hal_qteeconnector firmware_file:dir r_dir_perms;
+allow vendor_hal_qteeconnector firmware_file:file r_file_perms;
#Allow access to the gp_reqcancel socket
-allow hal_qteeconnector_qti tee:unix_dgram_socket sendto;
+allow vendor_hal_qteeconnector_qti tee:unix_dgram_socket sendto;
#Allow hal_qteeconnector client domain apps to find hwservice
-binder_call(hal_qteeconnector_client, hal_qteeconnector_server)
-binder_call(hal_qteeconnector_server, hal_qteeconnector_client)
-allow hal_qteeconnector_client hal_qteeconnector_hwservice:hwservice_manager find;
+binder_call(vendor_hal_qteeconnector_client, vendor_hal_qteeconnector_server)
+binder_call(vendor_hal_qteeconnector_server, vendor_hal_qteeconnector_client)
+allow vendor_hal_qteeconnector_client vendor_hal_qteeconnector_hwservice:hwservice_manager find;
diff --git a/qva/vendor/common/hal_scve.te b/qva/vendor/common/hal_scve.te
index 5e5ec99..67b5359 100644
--- a/qva/vendor/common/hal_scve.te
+++ b/qva/vendor/common/hal_scve.te
@@ -30,14 +30,14 @@
init_daemon_domain(vendor_scve)
-hal_server_domain(vendor_scve, hal_scve)
+hal_server_domain(vendor_scve, vendor_hal_scve)
-add_hwservice(hal_scve_server, hal_scve_hwservice)
+add_hwservice(vendor_hal_scve_server, vendor_hal_scve_hwservice)
-allow hal_scve_client hal_scve_hwservice:hwservice_manager find;
+allow vendor_hal_scve_client vendor_hal_scve_hwservice:hwservice_manager find;
-binder_call(hal_scve_client, hal_scve_server)
-binder_call(hal_scve_server, hal_scve_client)
+binder_call(vendor_hal_scve_client, vendor_hal_scve_server)
+binder_call(vendor_hal_scve_server, vendor_hal_scve_client)
r_dir_file(vendor_scve, adsprpcd_file)
@@ -45,8 +45,8 @@
allow vendor_scve ion_device:chr_file rw_file_perms;
# Access for DSP/QDSP device
-allow vendor_scve qdsp_device:chr_file rw_file_perms;
-allow vendor_scve dsp_device:chr_file rw_file_perms;
+allow vendor_scve vendor_qdsp_device:chr_file rw_file_perms;
+allow vendor_scve vendor_dsp_device:chr_file rw_file_perms;
# Access for GPU
allow vendor_scve gpu_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/hal_seccam_qti.te b/qva/vendor/common/hal_seccam_qti.te
index dbdea16..98e533d 100644
--- a/qva/vendor/common/hal_seccam_qti.te
+++ b/qva/vendor/common/hal_seccam_qti.te
@@ -25,18 +25,18 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_seccam_qti, domain;
+type vendor_hal_seccam_qti, domain;
-type hal_seccam_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_seccam_qti)
-hal_server_domain(hal_seccam_qti, hal_seccam)
+type vendor_hal_seccam_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_seccam_qti)
+hal_server_domain(vendor_hal_seccam_qti, vendor_hal_seccam)
-binder_call(hal_seccam_client, hal_seccam_server)
-binder_call(hal_seccam_server, hal_seccam_client)
+binder_call(vendor_hal_seccam_client, vendor_hal_seccam_server)
+binder_call(vendor_hal_seccam_server, vendor_hal_seccam_client)
-add_hwservice(hal_seccam_server, hal_seccam_hwservice)
+add_hwservice(vendor_hal_seccam_server, vendor_hal_seccam_hwservice)
-allow hal_seccam_qti video_device:chr_file rw_file_perms;
-hal_client_domain(hal_seccam_qti, hal_graphics_allocator)
-hal_client_domain(hal_seccam_qti, hal_perf)
-set_prop(hal_seccam_qti, vendor_core_ctl_prop);
+allow vendor_hal_seccam_qti video_device:chr_file rw_file_perms;
+hal_client_domain(vendor_hal_seccam_qti, hal_graphics_allocator)
+hal_client_domain(vendor_hal_seccam_qti, vendor_hal_perf)
+set_prop(vendor_hal_seccam_qti, vendor_core_ctl_prop);
diff --git a/qva/vendor/common/hal_secure_element_default.te b/qva/vendor/common/hal_secure_element_default.te
index 679c2d6..9210a56 100644
--- a/qva/vendor/common/hal_secure_element_default.te
+++ b/qva/vendor/common/hal_secure_element_default.te
@@ -25,8 +25,8 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(hal_secure_element_default, hal_qteeconnector)
-hal_client_domain(hal_secure_element_default, hal_esepowermanager)
+hal_client_domain(hal_secure_element_default, vendor_hal_qteeconnector)
+hal_client_domain(hal_secure_element_default, vendor_hal_esepowermanager)
-allow hal_secure_element_default secure_element_vendor_data_file:dir rw_dir_perms;
-allow hal_secure_element_default secure_element_vendor_data_file:file create_file_perms;
+allow hal_secure_element_default vendor_secure_element_vendor_data_file:dir rw_dir_perms;
+allow hal_secure_element_default vendor_secure_element_vendor_data_file:file create_file_perms;
diff --git a/qva/vendor/common/hal_secureprocessor_qti.te b/qva/vendor/common/hal_secureprocessor_qti.te
index 9366bbe..1547eaa 100644
--- a/qva/vendor/common/hal_secureprocessor_qti.te
+++ b/qva/vendor/common/hal_secureprocessor_qti.te
@@ -25,15 +25,15 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_secureprocessor_qti, domain;
-hal_server_domain(hal_secureprocessor_qti, hal_secureprocessor)
+type vendor_hal_secureprocessor_qti, domain;
+hal_server_domain(vendor_hal_secureprocessor_qti, vendor_hal_secureprocessor)
-type hal_secureprocessor_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_secureprocessor_qti)
+type vendor_hal_secureprocessor_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_secureprocessor_qti)
-binder_call(hal_secureprocessor_client, hal_secureprocessor_server)
-binder_call(hal_secureprocessor_server, hal_secureprocessor_client)
+binder_call(vendor_hal_secureprocessor_client, vendor_hal_secureprocessor_server)
+binder_call(vendor_hal_secureprocessor_server, vendor_hal_secureprocessor_client)
-hal_attribute_hwservice(hal_secureprocessor, hal_secureprocessor_hwservice)
+hal_attribute_hwservice(vendor_hal_secureprocessor, vendor_hal_secureprocessor_hwservice)
-allow hal_secureprocessor_qti tee_device:chr_file rw_file_perms;
+allow vendor_hal_secureprocessor_qti tee_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/hal_sensorscalibrate_qti.te b/qva/vendor/common/hal_sensorscalibrate_qti.te
index 3ef8d72..9b8e33e 100644
--- a/qva/vendor/common/hal_sensorscalibrate_qti.te
+++ b/qva/vendor/common/hal_sensorscalibrate_qti.te
@@ -25,9 +25,9 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-binder_call(hal_sensorscalibrate_qti_client, hal_sensorscalibrate_qti_server)
-binder_call(hal_sensorscalibrate_qti_server, hal_sensorscalibrate_qti_client)
+binder_call(vendor_hal_sensorscalibrate_qti_client, vendor_hal_sensorscalibrate_qti_server)
+binder_call(vendor_hal_sensorscalibrate_qti_server, vendor_hal_sensorscalibrate_qti_client)
-add_hwservice(hal_sensorscalibrate_qti_server, hal_sensorscalibrate_qti_hwservice)
+add_hwservice(vendor_hal_sensorscalibrate_qti_server, vendor_hal_sensorscalibrate_qti_hwservice)
-allow hal_sensorscalibrate_qti_client hal_sensorscalibrate_qti_hwservice:hwservice_manager find;
+allow vendor_hal_sensorscalibrate_qti_client vendor_hal_sensorscalibrate_qti_hwservice:hwservice_manager find;
diff --git a/qva/vendor/common/hal_sensorscalibrate_qti_default.te b/qva/vendor/common/hal_sensorscalibrate_qti_default.te
index 0f09608..eaca97e 100644
--- a/qva/vendor/common/hal_sensorscalibrate_qti_default.te
+++ b/qva/vendor/common/hal_sensorscalibrate_qti_default.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_sensorscalibrate_qti_default, domain;
-hal_server_domain(hal_sensorscalibrate_qti_default, hal_sensorscalibrate_qti)
+type vendor_hal_sensorscalibrate_qti_default, domain;
+hal_server_domain(vendor_hal_sensorscalibrate_qti_default, vendor_hal_sensorscalibrate_qti)
-type hal_sensorscalibrate_qti_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_sensorscalibrate_qti_default)
-r_dir_file(hal_sensorscalibrate_qti_default, mnt_vendor_file)
+type vendor_hal_sensorscalibrate_qti_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_sensorscalibrate_qti_default)
+r_dir_file(vendor_hal_sensorscalibrate_qti_default, mnt_vendor_file)
-allow hal_sensorscalibrate_qti sysfs_data:file r_file_perms;
-allow hal_sensorscalibrate_qti self:{ socket qipcrtr_socket } create_socket_perms;
-allowxperm hal_sensorscalibrate_qti self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+allow vendor_hal_sensorscalibrate_qti vendor_sysfs_data:file r_file_perms;
+allow vendor_hal_sensorscalibrate_qti self:{ socket qipcrtr_socket } create_socket_perms;
+allowxperm vendor_hal_sensorscalibrate_qti self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
diff --git a/qva/vendor/common/hal_soter_qti.te b/qva/vendor/common/hal_soter_qti.te
index 5f68da9..92fdc8a 100755
--- a/qva/vendor/common/hal_soter_qti.te
+++ b/qva/vendor/common/hal_soter_qti.te
@@ -25,25 +25,25 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_soter_qti, domain;
-hal_server_domain(hal_soter_qti, hal_soter)
+type vendor_hal_soter_qti, domain;
+hal_server_domain(vendor_hal_soter_qti, vendor_hal_soter)
-type hal_soter_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_soter_qti)
+type vendor_hal_soter_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_soter_qti)
-binder_call(hal_soter_client, hal_soter_server)
-binder_call(hal_soter_server, hal_soter_client)
+binder_call(vendor_hal_soter_client, vendor_hal_soter_server)
+binder_call(vendor_hal_soter_server, vendor_hal_soter_client)
-add_hwservice(hal_soter_server, hal_soter_hwservice)
-allow hal_soter_client hal_soter_hwservice:hwservice_manager find;
+add_hwservice(vendor_hal_soter_server, vendor_hal_soter_hwservice)
+allow vendor_hal_soter_client vendor_hal_soter_hwservice:hwservice_manager find;
#Allow access to tee device
-allow hal_soter_qti tee_device:chr_file rw_file_perms;
+allow vendor_hal_soter_qti tee_device:chr_file rw_file_perms;
#Allow access to load firmware images
-r_dir_file(hal_soter_qti, firmware_file)
+r_dir_file(vendor_hal_soter_qti, firmware_file)
#Allow access to interract with ion_device
-allow hal_soter_qti ion_device:chr_file r_file_perms;
+allow vendor_hal_soter_qti ion_device:chr_file r_file_perms;
-get_prop(hal_soter_qti, vendor_tee_listener_prop)
+get_prop(vendor_hal_soter_qti, vendor_tee_listener_prop)
diff --git a/qva/vendor/common/hal_srvctracker_default.te b/qva/vendor/common/hal_srvctracker_default.te
index 2724589..330f72c 100644
--- a/qva/vendor/common/hal_srvctracker_default.te
+++ b/qva/vendor/common/hal_srvctracker_default.te
@@ -26,17 +26,17 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#Define Domain
-type hal_srvctracker_default, domain;
-type hal_srvctracker_default_exec, exec_type, vendor_file_type, file_type;
-hal_server_domain(hal_srvctracker_default, hal_srvctracker)
-init_daemon_domain(hal_srvctracker_default)
+type vendor_hal_srvctracker_default, domain;
+type vendor_hal_srvctracker_default_exec, exec_type, vendor_file_type, file_type;
+hal_server_domain(vendor_hal_srvctracker_default, vendor_hal_srvctracker)
+init_daemon_domain(vendor_hal_srvctracker_default)
-binder_call(hal_srvctracker_client, hal_srvctracker_server)
-binder_call(hal_srvctracker_server, hal_srvctracker_client)
+binder_call(vendor_hal_srvctracker_client, vendor_hal_srvctracker_server)
+binder_call(vendor_hal_srvctracker_server, vendor_hal_srvctracker_client)
-add_hwservice(hal_srvctracker, hal_srvctracker_hwservice)
+add_hwservice(vendor_hal_srvctracker, vendor_hal_srvctracker_hwservice)
-allow hal_srvctracker_client hal_srvctracker_hwservice:hwservice_manager find;
-allow hal_srvctracker hwservicemanager:binder call;
+allow vendor_hal_srvctracker_client vendor_hal_srvctracker_hwservice:hwservice_manager find;
+allow vendor_hal_srvctracker hwservicemanager:binder call;
-get_prop(hal_srvctracker_default, hwservicemanager_prop)
+get_prop(vendor_hal_srvctracker_default, hwservicemanager_prop)
diff --git a/qva/vendor/common/hal_usb.te b/qva/vendor/common/hal_usb.te
index d67cf01..7eb9c20 100644
--- a/qva/vendor/common/hal_usb.te
+++ b/qva/vendor/common/hal_usb.te
@@ -25,17 +25,17 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_usb_qti, domain;
-hal_server_domain(hal_usb_qti, hal_usb_gadget)
-hal_server_domain(hal_usb_qti, hal_usb)
+type vendor_hal_usb_qti, domain;
+hal_server_domain(vendor_hal_usb_qti, hal_usb_gadget)
+hal_server_domain(vendor_hal_usb_qti, hal_usb)
-type hal_usb_qti_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_usb_qti)
+type vendor_hal_usb_qti_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_usb_qti)
-get_prop(hal_usb_qti, vendor_usb_prop)
-set_prop(hal_usb_qti, vendor_usb_prop)
+get_prop(vendor_hal_usb_qti, vendor_usb_prop)
+set_prop(vendor_hal_usb_qti, vendor_usb_prop)
-allow hal_usb_qti configfs:file create_file_perms;
-allow hal_usb_qti sysfs_usb_c:dir r_dir_perms;
-allow hal_usb_qti sysfs_usb_c:lnk_file r_file_perms;
-allow hal_usb_qti sysfs_usb_c:file rw_file_perms;
+allow vendor_hal_usb_qti configfs:file create_file_perms;
+allow vendor_hal_usb_qti vendor_sysfs_usb_c:dir r_dir_perms;
+allow vendor_hal_usb_qti vendor_sysfs_usb_c:lnk_file r_file_perms;
+allow vendor_hal_usb_qti vendor_sysfs_usb_c:file rw_file_perms;
diff --git a/qva/vendor/common/hal_wifi_hostapd.te b/qva/vendor/common/hal_wifi_hostapd.te
index f44efb2..3d6bf37 100644
--- a/qva/vendor/common/hal_wifi_hostapd.te
+++ b/qva/vendor/common/hal_wifi_hostapd.te
@@ -26,23 +26,23 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Allow hostapd to access it's data folder
-r_dir_file(hal_wifi_hostapd_default, wifi_vendor_data_file)
+r_dir_file(hal_wifi_hostapd_default, vendor_wifi_vendor_data_file)
allow hal_wifi_hostapd_default hostapd_data_file:dir rw_dir_perms;
allow hal_wifi_hostapd_default hostapd_data_file:file create_file_perms;
# Allow hostapd to create control socket under its data folder
allow hal_wifi_hostapd_default hostapd_data_file:sock_file create_file_perms;
# Allow hostapd to connect to fstman using control socket
-allow hal_wifi_hostapd_default fstman:unix_dgram_socket sendto;
+allow hal_wifi_hostapd_default vendor_fstman:unix_dgram_socket sendto;
# wigig_hostapd has its own directory for sockets,
# in order to prevent conflicts with wifi hostapd
# allow wigig_hostapd to create the directory holding its control socket
-allow hal_wifi_hostapd_default wigig_hostapd_socket:dir create_dir_perms;
+allow hal_wifi_hostapd_default vendor_wigig_hostapd_socket:dir create_dir_perms;
# wigig_hostapd needs to create, bind to, read and write its control socket
-allow hal_wifi_hostapd_default wigig_hostapd_socket:sock_file create_file_perms;
+allow hal_wifi_hostapd_default vendor_wigig_hostapd_socket:sock_file create_file_perms;
# allow wigig_hostapd to send replies to wigighalsvc
-allow hal_wifi_hostapd_default wigighalsvc:unix_dgram_socket sendto;
+allow hal_wifi_hostapd_default vendor_wigighalsvc:unix_dgram_socket sendto;
# allow hostapd to attach to fstman socket
-allow hal_wifi_hostapd_default wifi_vendor_wpa_socket:dir r_dir_perms;
-allow hal_wifi_hostapd_default wifi_vendor_wpa_socket:sock_file rw_file_perms;
-allow hal_wifi_hostapd_default wigig_vendor_wpa_socket:sock_file rw_file_perms;
+allow hal_wifi_hostapd_default vendor_wifi_vendor_wpa_socket:dir r_dir_perms;
+allow hal_wifi_hostapd_default vendor_wifi_vendor_wpa_socket:sock_file rw_file_perms;
+allow hal_wifi_hostapd_default vendor_wigig_vendor_wpa_socket:sock_file rw_file_perms;
diff --git a/qva/vendor/common/hal_wifi_supplicant.te b/qva/vendor/common/hal_wifi_supplicant.te
index 19c7ab0..289a9f5 100644
--- a/qva/vendor/common/hal_wifi_supplicant.te
+++ b/qva/vendor/common/hal_wifi_supplicant.te
@@ -32,13 +32,13 @@
# Allow write to proc_net.
allow hal_wifi_supplicant_default proc_net:file write;
-allow hal_wifi_supplicant wifi_vendor_data_file:dir create_dir_perms;
-allow hal_wifi_supplicant wifi_vendor_data_file:file create_file_perms;
-allow hal_wifi_supplicant wifi_vendor_wpa_socket:dir create_dir_perms;
-allow hal_wifi_supplicant wifi_vendor_wpa_socket:sock_file create_file_perms;
-allow hal_wifi_supplicant wigig_vendor_wpa_socket:sock_file rw_file_perms;
+allow hal_wifi_supplicant vendor_wifi_vendor_data_file:dir create_dir_perms;
+allow hal_wifi_supplicant vendor_wifi_vendor_data_file:file create_file_perms;
+allow hal_wifi_supplicant vendor_wifi_vendor_wpa_socket:dir create_dir_perms;
+allow hal_wifi_supplicant vendor_wifi_vendor_wpa_socket:sock_file create_file_perms;
+allow hal_wifi_supplicant vendor_wigig_vendor_wpa_socket:sock_file rw_file_perms;
-allow hal_wifi_supplicant fstman:unix_dgram_socket sendto;
-allow hal_wifi_supplicant wigighalsvc:unix_dgram_socket sendto;
+allow hal_wifi_supplicant vendor_fstman:unix_dgram_socket sendto;
+allow hal_wifi_supplicant vendor_wigighalsvc:unix_dgram_socket sendto;
-type_transition hal_wifi_supplicant wifi_vendor_data_file:dir wifi_vendor_wpa_socket "wigig_sockets";
+type_transition hal_wifi_supplicant vendor_wifi_vendor_data_file:dir vendor_wifi_vendor_wpa_socket "wigig_sockets";
diff --git a/qva/vendor/common/hostapd.te b/qva/vendor/common/hostapd.te
index abfbab2..023e8e6 100644
--- a/qva/vendor/common/hostapd.te
+++ b/qva/vendor/common/hostapd.te
@@ -26,29 +26,29 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# userspace wifi access points
-type hostapd, domain;
-type hostapd_exec, exec_type, vendor_file_type, file_type;
+type vendor_hostapd, domain;
+type vendor_hostapd_exec, exec_type, vendor_file_type, file_type;
-binder_call(hostapd, cnd)
-unix_socket_connect(hostapd, cnd, cnd)
-unix_socket_send(hostapd, cnd, cnd)
-allow hostapd cnd:{
+binder_call(vendor_hostapd, vendor_cnd)
+unix_socket_connect(vendor_hostapd, vendor_cnd, vendor_cnd)
+unix_socket_send(vendor_hostapd, vendor_cnd, vendor_cnd)
+allow vendor_hostapd vendor_cnd:{
fifo_file
netlink_route_socket
netlink_tcpdiag_socket
unix_stream_socket
unix_dgram_socket} { read write };
-allow hostapd cnd:fifo_file r_file_perms;
-allow hostapd smem_log_device:chr_file rw_file_perms;
-allow hostapd wifi_vendor_data_file:dir w_dir_perms;
-allow hostapd wifi_vendor_data_file:file create_file_perms;
-allow hostapd hostapd_data_file:dir w_dir_perms;
-allow hostapd hostapd_data_file:sock_file create_file_perms;
-allow hostapd wifi_vendor_wpa_socket:dir r_dir_perms;
-allow hostapd wifi_vendor_wpa_socket:sock_file rw_file_perms;
+allow vendor_hostapd vendor_cnd:fifo_file r_file_perms;
+allow vendor_hostapd vendor_smem_log_device:chr_file rw_file_perms;
+allow vendor_hostapd vendor_wifi_vendor_data_file:dir w_dir_perms;
+allow vendor_hostapd vendor_wifi_vendor_data_file:file create_file_perms;
+allow vendor_hostapd hostapd_data_file:dir w_dir_perms;
+allow vendor_hostapd hostapd_data_file:sock_file create_file_perms;
+allow vendor_hostapd vendor_wifi_vendor_wpa_socket:dir r_dir_perms;
+allow vendor_hostapd vendor_wifi_vendor_wpa_socket:sock_file rw_file_perms;
#diag
userdebug_or_eng(`
- diag_use(hostapd)
- unix_socket_send(hostapd, wifi_vendor_wpa, su)
+ diag_use(vendor_hostapd)
+ unix_socket_send(vendor_hostapd, vendor_wifi_vendor_wpa, su)
')
diff --git a/qva/vendor/common/hvdcp.te b/qva/vendor/common/hvdcp.te
index 22a25dc..fd5039f 100644
--- a/qva/vendor/common/hvdcp.te
+++ b/qva/vendor/common/hvdcp.te
@@ -25,45 +25,45 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# HVDVP quickcharge
-type hvdcp, domain;
-type hvdcp_exec, exec_type, vendor_file_type, file_type;
+type vendor_hvdcp, domain;
+type vendor_hvdcp_exec, exec_type, vendor_file_type, file_type;
# Make transition to its own HVDCP domain from init
-init_daemon_domain(hvdcp)
+init_daemon_domain(vendor_hvdcp)
# Add rules for access permissions
-allow hvdcp hvdcp_device:chr_file rw_file_perms;
-allow hvdcp qg_device:chr_file rw_file_perms;
-allow hvdcp {
- sysfs_battery_supply
- sysfs_usb_supply
- sysfs_usbpd_device
- sysfs_vadc_dev
- sysfs_spmi_dev
+allow vendor_hvdcp vendor_hvdcp_device:chr_file rw_file_perms;
+allow vendor_hvdcp vendor_qg_device:chr_file rw_file_perms;
+allow vendor_hvdcp {
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
+ vendor_sysfs_usbpd_device
+ vendor_sysfs_vadc_dev
+ vendor_sysfs_spmi_dev
}:dir r_dir_perms;
-allow hvdcp {
- sysfs_battery_supply
- sysfs_usb_supply
- sysfs_usbpd_device
- sysfs_vadc_dev
- sysfs_spmi_dev
+allow vendor_hvdcp {
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
+ vendor_sysfs_usbpd_device
+ vendor_sysfs_vadc_dev
+ vendor_sysfs_spmi_dev
}:file rw_file_perms;
-allow hvdcp {
- sysfs_battery_supply
- sysfs_usb_supply
- sysfs_vadc_dev
- sysfs_spmi_dev
+allow vendor_hvdcp {
+ vendor_sysfs_battery_supply
+ vendor_sysfs_usb_supply
+ vendor_sysfs_vadc_dev
+ vendor_sysfs_spmi_dev
}:lnk_file r_file_perms;
-allow hvdcp self:capability2 wake_alarm;
-userdebug_or_eng(`allow hvdcp kmsg_device:chr_file rw_file_perms;')
-allow hvdcp self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
+allow vendor_hvdcp self:capability2 wake_alarm;
+userdebug_or_eng(`allow vendor_hvdcp kmsg_device:chr_file rw_file_perms;')
+allow vendor_hvdcp self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-allow hvdcp mnt_vendor_file:dir search;
-allow hvdcp persist_hvdcp_file:dir rw_dir_perms;
-allow hvdcp persist_hvdcp_file:file create_file_perms;
+allow vendor_hvdcp mnt_vendor_file:dir search;
+allow vendor_hvdcp vendor_persist_hvdcp_file:dir rw_dir_perms;
+allow vendor_hvdcp vendor_persist_hvdcp_file:file create_file_perms;
-set_prop(hvdcp, vendor_hvdcp_opti_prop)
-wakelock_use(hvdcp)
+set_prop(vendor_hvdcp, vendor_hvdcp_opti_prop)
+wakelock_use(vendor_hvdcp)
diff --git a/qva/vendor/common/hwservice.te b/qva/vendor/common/hwservice.te
index 3760ad8..1a6a1bf 100644
--- a/qva/vendor/common/hwservice.te
+++ b/qva/vendor/common/hwservice.te
@@ -25,29 +25,29 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_dpmqmi_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_iop_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_pasrmanager_hwservice, hwservice_manager_type, protected_hwservice;
-type wifidisplayhalservice_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_alarm_qti_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_vpp_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_wigig_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_seccam_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_wigig_npt_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_fstman_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_qteeconnector_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_sensorscalibrate_qti_hwservice , hwservice_manager_type, protected_hwservice;
-type hal_datafactory_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_latency_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_scve_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_soter_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_esepowermanager_hwservice, hwservice_manager_type, protected_hwservice;
-type vendor_hal_factory_qti_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_cvp_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_fm_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_btconfigstore_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_wifilearner_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_srvctracker_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_secureprocessor_hwservice, hwservice_manager_type, protected_hwservice;
-type hal_qspmhal_hwservice, hwservice_manager_type;
-type hal_bluetooth_dun_hwservice, hwservice_manager_type, protected_hwservice;
+type vendor_hal_dpmqmi_hwservice, hwservice_manager_type;
+type vendor_hal_iop_hwservice, hwservice_manager_type;
+type vendor_hal_pasrmanager_hwservice, hwservice_manager_type;
+type vendor_wifidisplayhalservice_hwservice , hwservice_manager_type;
+type vendor_hal_alarm_qti_hwservice , hwservice_manager_type;
+type vendor_hal_vpp_hwservice , hwservice_manager_type;
+type vendor_hal_wigig_hwservice , hwservice_manager_type;
+type vendor_hal_seccam_hwservice, hwservice_manager_type;
+type vendor_hal_wigig_npt_hwservice , hwservice_manager_type;
+type vendor_hal_fstman_hwservice , hwservice_manager_type, protected_hwservice;
+type vendor_hal_qteeconnector_hwservice , hwservice_manager_type;
+type vendor_hal_sensorscalibrate_qti_hwservice , hwservice_manager_type;
+type vendor_hal_datafactory_hwservice, hwservice_manager_type;
+type vendor_hal_latency_hwservice, hwservice_manager_type;
+type vendor_hal_scve_hwservice, hwservice_manager_type;
+type vendor_hal_soter_hwservice, hwservice_manager_type;
+type vendor_hal_esepowermanager_hwservice, hwservice_manager_type;
+type vendor_hal_factory_qti_hwservice, hwservice_manager_type;
+type vendor_hal_cvp_hwservice, hwservice_manager_type;
+type vendor_hal_fm_hwservice, hwservice_manager_type;
+type vendor_hal_btconfigstore_hwservice, hwservice_manager_type;
+type vendor_hal_wifilearner_hwservice, hwservice_manager_type;
+type vendor_hal_srvctracker_hwservice, hwservice_manager_type;
+type vendor_hal_secureprocessor_hwservice, hwservice_manager_type, protected_hwservice;
+type vendor_hal_qspmhal_hwservice, untrusted_app_visible_hwservice_violators, hwservice_manager_type;
+type vendor_hal_bluetooth_dun_hwservice, hwservice_manager_type;
diff --git a/qva/vendor/common/hwservice_contexts b/qva/vendor/common/hwservice_contexts
index 361e2c5..a92b99d 100644
--- a/qva/vendor/common/hwservice_contexts
+++ b/qva/vendor/common/hwservice_contexts
@@ -25,48 +25,48 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-com.qualcomm.qti.wifidisplayhal::IHDCPSession u:object_r:wifidisplayhalservice_hwservice:s0
-vendor.qti.hardware.iop::IIop u:object_r:hal_iop_hwservice:s0
-com.qualcomm.qti.wifidisplayhal::IDSManager u:object_r:wifidisplayhalservice_hwservice:s0
-vendor.qti.hardware.alarm::IAlarm u:object_r:hal_alarm_qti_hwservice:s0
-vendor.qti.hardware.vpp::IHidlVppService u:object_r:hal_vpp_hwservice:s0
-vendor.qti.hardware.wigig.supptunnel::ISuppTunnelProvider u:object_r:hal_wigig_hwservice:s0
-vendor.qti.hardware.wigig.netperftuner::INetPerfTuner u:object_r:hal_wigig_npt_hwservice:s0
-vendor.qti.hardware.fstman::IFstManager u:object_r:hal_fstman_hwservice:s0
-vendor.qti.hardware.qteeconnector::IAppConnector u:object_r:hal_qteeconnector_hwservice:s0
-vendor.qti.hardware.qteeconnector::IGPAppConnector u:object_r:hal_qteeconnector_hwservice:s0
-vendor.qti.power.pasrmanager::IPasrManager u:object_r:hal_pasrmanager_hwservice:s0
+com.qualcomm.qti.wifidisplayhal::IHDCPSession u:object_r:vendor_wifidisplayhalservice_hwservice:s0
+vendor.qti.hardware.iop::IIop u:object_r:vendor_hal_iop_hwservice:s0
+com.qualcomm.qti.wifidisplayhal::IDSManager u:object_r:vendor_wifidisplayhalservice_hwservice:s0
+vendor.qti.hardware.alarm::IAlarm u:object_r:vendor_hal_alarm_qti_hwservice:s0
+vendor.qti.hardware.vpp::IHidlVppService u:object_r:vendor_hal_vpp_hwservice:s0
+vendor.qti.hardware.wigig.supptunnel::ISuppTunnelProvider u:object_r:vendor_hal_wigig_hwservice:s0
+vendor.qti.hardware.wigig.netperftuner::INetPerfTuner u:object_r:vendor_hal_wigig_npt_hwservice:s0
+vendor.qti.hardware.fstman::IFstManager u:object_r:vendor_hal_fstman_hwservice:s0
+vendor.qti.hardware.qteeconnector::IAppConnector u:object_r:vendor_hal_qteeconnector_hwservice:s0
+vendor.qti.hardware.qteeconnector::IGPAppConnector u:object_r:vendor_hal_qteeconnector_hwservice:s0
+vendor.qti.power.pasrmanager::IPasrManager u:object_r:vendor_hal_pasrmanager_hwservice:s0
com.qualcomm.qti.bluetooth_audio::IBluetoothAudio u:object_r:hal_audio_hwservice:s0
-vendor.qti.hardware.btconfigstore::IBTConfigStore u:object_r:hal_btconfigstore_hwservice:s0
-vendor.qti.hardware.bluetooth_dun::IBluetoothDunServer u:object_r:hal_bluetooth_dun_hwservice:s0
-com.qualcomm.qti.dpm.api::IdpmQmi u:object_r:hal_dpmqmi_hwservice:s0
+vendor.qti.hardware.btconfigstore::IBTConfigStore u:object_r:vendor_hal_btconfigstore_hwservice:s0
+vendor.qti.hardware.bluetooth_dun::IBluetoothDunServer u:object_r:vendor_hal_bluetooth_dun_hwservice:s0
+com.qualcomm.qti.dpm.api::IdpmQmi u:object_r:vendor_hal_dpmqmi_hwservice:s0
vendor.qti.hardware.audiohalext::IAudioHalExt u:object_r:hal_audio_hwservice:s0
-vendor.qti.hardware.seccam::ISecCam u:object_r:hal_seccam_hwservice:s0
+vendor.qti.hardware.seccam::ISecCam u:object_r:vendor_hal_seccam_hwservice:s0
vendor.qti.gnss::ILocHidlGnss u:object_r:hal_gnss_hwservice:s0
vendor.nxp.hardware.nfc::INqNfc u:object_r:hal_nfc_hwservice:s0
-vendor.qti.hardware.sensorscalibrate::ISensorsCalibrate u:object_r:hal_sensorscalibrate_qti_hwservice:s0
-com.qualcomm.qti.imscmservice::IImsCmService u:object_r:hal_imsrcsd_hwservice:s0
+vendor.qti.hardware.sensorscalibrate::ISensorsCalibrate u:object_r:vendor_hal_sensorscalibrate_qti_hwservice:s0
+com.qualcomm.qti.imscmservice::IImsCmService u:object_r:vendor_hal_imsrcsd_hwservice:s0
vendor.qti.hardware.fingerprint::IQtiExtendedFingerprint u:object_r:hal_fingerprint_hwservice:s0
vendor.qti.hardware.radio.qtiradio::IQtiRadio u:object_r:hal_telephony_hwservice:s0
-vendor.qti.hardware.data.latency::ILinkLatency u:object_r:hal_latency_hwservice:s0
-vendor.qti.hardware.scve.objecttracker::IObjectTracker u:object_r:hal_scve_hwservice:s0
-vendor.qti.hardware.scve.panorama::IPanoramaStitching u:object_r:hal_scve_hwservice:s0
-vendor.qti.hardware.scve.panorama::IPanoramaTracking u:object_r:hal_scve_hwservice:s0
-vendor.qti.hardware.soter::ISoter u:object_r:hal_soter_hwservice:s0
-vendor.qti.hardware.servicetracker::IServicetracker u:object_r:hal_srvctracker_hwservice:s0
-vendor.qti.hardware.fm::IFmHci u:object_r:hal_fm_hwservice:s0
-vendor.qti.esepowermanager::IEsePowerManager u:object_r:hal_esepowermanager_hwservice:s0
+vendor.qti.hardware.data.latency::ILinkLatency u:object_r:vendor_hal_latency_hwservice:s0
+vendor.qti.hardware.scve.objecttracker::IObjectTracker u:object_r:vendor_hal_scve_hwservice:s0
+vendor.qti.hardware.scve.panorama::IPanoramaStitching u:object_r:vendor_hal_scve_hwservice:s0
+vendor.qti.hardware.scve.panorama::IPanoramaTracking u:object_r:vendor_hal_scve_hwservice:s0
+vendor.qti.hardware.soter::ISoter u:object_r:vendor_hal_soter_hwservice:s0
+vendor.qti.hardware.servicetracker::IServicetracker u:object_r:vendor_hal_srvctracker_hwservice:s0
+vendor.qti.hardware.fm::IFmHci u:object_r:vendor_hal_fm_hwservice:s0
+vendor.qti.esepowermanager::IEsePowerManager u:object_r:vendor_hal_esepowermanager_hwservice:s0
vendor.qti.hardware.wifi.supplicant::ISupplicantVendor u:object_r:hal_wifi_supplicant_hwservice:s0
vendor.qti.hardware.factory::IFactory u:object_r:vendor_hal_factory_qti_hwservice:s0
-vendor.qti.hardware.cvp::ICvp u:object_r:hal_cvp_hwservice:s0
+vendor.qti.hardware.cvp::ICvp u:object_r:vendor_hal_cvp_hwservice:s0
vendor.qti.hardware.bluetooth_sar::IBluetoothSar u:object_r:hal_bluetooth_hwservice:s0
-vendor.qti.hardware.wifidisplaysession::IWifiDisplaySession u:object_r:wifidisplayhalservice_hwservice:s0
-vendor.qti.hardware.wifidisplaysession::IWifiDisplaySessionVideoTrack u:object_r:wifidisplayhalservice_hwservice:s0
-vendor.qti.hardware.wifidisplaysession::IWifiDisplaySessionAudioTrack u:object_r:wifidisplayhalservice_hwservice:s0
-vendor.qti.hardware.wifidisplaysession::IWifiDisplaySessionImageTrack u:object_r:wifidisplayhalservice_hwservice:s0
+vendor.qti.hardware.wifidisplaysession::IWifiDisplaySession u:object_r:vendor_wifidisplayhalservice_hwservice:s0
+vendor.qti.hardware.wifidisplaysession::IWifiDisplaySessionVideoTrack u:object_r:vendor_wifidisplayhalservice_hwservice:s0
+vendor.qti.hardware.wifidisplaysession::IWifiDisplaySessionAudioTrack u:object_r:vendor_wifidisplayhalservice_hwservice:s0
+vendor.qti.hardware.wifidisplaysession::IWifiDisplaySessionImageTrack u:object_r:vendor_wifidisplayhalservice_hwservice:s0
vendor.qti.hardware.wifi.hostapd::IHostapdVendor u:object_r:hal_wifi_hostapd_hwservice:s0
vendor.qti.hardware.bluetooth_audio::IBluetoothAudioProvidersFactory u:object_r:hal_audio_hwservice:s0
-vendor.qti.hardware.wifi.wifilearner::IWifiStats u:object_r:hal_wifilearner_hwservice:s0
-vendor.qti.qspmhal::IQspmhal u:object_r:hal_qspmhal_hwservice:s0
-vendor.qti.hardware.secureprocessor.device::ISecureProcessor u:object_r:hal_secureprocessor_hwservice:s0
+vendor.qti.hardware.wifi.wifilearner::IWifiStats u:object_r:vendor_hal_wifilearner_hwservice:s0
+vendor.qti.qspmhal::IQspmhal u:object_r:vendor_hal_qspmhal_hwservice:s0
+vendor.qti.hardware.secureprocessor.device::ISecureProcessor u:object_r:vendor_hal_secureprocessor_hwservice:s0
vendor.qti.hardware.cryptfshw::ICryptfsHw u:object_r:hal_keymaster_hwservice:s0
diff --git a/qva/vendor/common/ims.te b/qva/vendor/common/ims.te
index 594090b..d989e9d 100644
--- a/qva/vendor/common/ims.te
+++ b/qva/vendor/common/ims.te
@@ -26,32 +26,32 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Use generic netlink socket
-allow ims self:{
+allow vendor_ims self:{
netlink_socket
socket
netlink_generic_socket
} create_socket_perms_no_ioctl;
-allow ims self:{ qipcrtr_socket } rw_socket_perms_no_ioctl;
+allow vendor_ims self:{ qipcrtr_socket } rw_socket_perms_no_ioctl;
# To run NDC command
-allow ims {
+allow vendor_ims {
vendor_shell_exec
# IMS route installation
- wcnss_service_exec
+ vendor_wcnss_service_exec
}:file rx_file_perms;
-set_prop(ims, qcom_ims_prop)
-set_prop(ims, ctl_vendor_imsrcsservice_prop)
+set_prop(vendor_ims, vendor_qcom_ims_prop)
+set_prop(vendor_ims, vendor_ctl_vendor_imsrcsservice_prop)
# Inherit and use open files from radio.
-allow ims radio:fd use;
+allow vendor_ims radio:fd use;
-allow ims self:{ udp_socket } ioctl;
+allow vendor_ims self:{ udp_socket } ioctl;
# ioctlcmd=89fd
-allowxperm ims self:udp_socket ioctl priv_sock_ioctls;
-allow ims sysfs_data:file r_file_perms;
+allowxperm vendor_ims self:udp_socket ioctl priv_sock_ioctls;
+allow vendor_ims vendor_sysfs_data:file r_file_perms;
-get_prop(ims, cnd_vendor_prop)
-allow ims hal_datafactory_hwservice:hwservice_manager find;
+get_prop(vendor_ims, vendor_cnd_vendor_prop)
+allow vendor_ims vendor_hal_datafactory_hwservice:hwservice_manager find;
diff --git a/qva/vendor/common/init.te b/qva/vendor/common/init.te
index d800572..24efd8d 100644
--- a/qva/vendor/common/init.te
+++ b/qva/vendor/common/init.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow init sysfs_graphics:file setattr;
+allow init vendor_sysfs_graphics:file setattr;
diff --git a/qva/vendor/common/init_shell.te b/qva/vendor/common/init_shell.te
index 914d760..e0c3251 100644
--- a/qva/vendor/common/init_shell.te
+++ b/qva/vendor/common/init_shell.te
@@ -25,25 +25,25 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow qti_init_shell sysfs_npu:file rw_file_perms;
-set_prop(qti_init_shell, vendor_mdm_helper_prop)
-set_prop(qti_init_shell, vendor_mmi_prop)
+allow vendor_qti_init_shell vendor_sysfs_npu:file rw_file_perms;
+set_prop(vendor_qti_init_shell, vendor_mdm_helper_prop)
+set_prop(vendor_qti_init_shell, vendor_mmi_prop)
-set_prop(qti_init_shell, vendor_video_prop)
+set_prop(vendor_qti_init_shell, vendor_video_prop)
-set_prop(qti_init_shell, vendor_dataadpl_prop)
+set_prop(vendor_qti_init_shell, vendor_dataadpl_prop)
#perf
-set_prop(qti_init_shell, vendor_mpctl_prop)
+set_prop(vendor_qti_init_shell, vendor_mpctl_prop)
# hvdcp_opti property
-set_prop(qti_init_shell, vendor_hvdcp_opti_prop)
+set_prop(vendor_qti_init_shell, vendor_hvdcp_opti_prop)
# To write to /data/vendor/perfd
-allow qti_init_shell mpctl_data_file:dir w_dir_perms;
-allow qti_init_shell mpctl_data_file:file { write getattr unlink };
+allow vendor_qti_init_shell vendor_mpctl_data_file:dir w_dir_perms;
+allow vendor_qti_init_shell vendor_mpctl_data_file:file { write getattr unlink };
userdebug_or_eng(`
# Needed for starting console in userdebug mode
-set_prop(qti_init_shell, vendor_audio_debug_prop)
+set_prop(vendor_qti_init_shell, vendor_audio_debug_prop)
')
diff --git a/qva/vendor/common/lmkd.te b/qva/vendor/common/lmkd.te
index dcb4155..e417afd 100644
--- a/qva/vendor/common/lmkd.te
+++ b/qva/vendor/common/lmkd.te
@@ -25,7 +25,7 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow lmkd hal_perf_hwservice:hwservice_manager find;
-allow lmkd hal_perf_default:binder call;
+allow lmkd vendor_hal_perf_hwservice:hwservice_manager find;
+allow lmkd vendor_hal_perf_default:binder call;
allow lmkd hwservicemanager:binder call;
get_prop(lmkd, hwservicemanager_prop);
diff --git a/qva/vendor/common/location.te b/qva/vendor/common/location.te
index 621a6b9..f882b9c 100644
--- a/qva/vendor/common/location.te
+++ b/qva/vendor/common/location.te
@@ -29,15 +29,15 @@
## xtwifi-client
################
-wakelock_use(location)
-allow location self:capability2 wake_alarm;
-unix_socket_connect(location, property, init);
-allow location mnt_vendor_file:dir search;
+wakelock_use(vendor_location)
+allow vendor_location self:capability2 wake_alarm;
+unix_socket_connect(vendor_location, property, init);
+allow vendor_location mnt_vendor_file:dir search;
# access to /persist/hlos_rfs/shared
-allow location persist_rfs_shared_hlos_file:dir r_dir_perms;
-allow location persist_rfs_shared_hlos_file:file rw_file_perms;
+allow vendor_location vendor_persist_rfs_shared_hlos_file:dir r_dir_perms;
+allow vendor_location vendor_persist_rfs_shared_hlos_file:file rw_file_perms;
## xtra-daemon
##############
#access to qdma socket
-qdma_file_socket(location);
+qdma_file_socket(vendor_location);
diff --git a/qva/vendor/common/location_app.te b/qva/vendor/common/location_app.te
index 558b3ca..2d7fa90 100644
--- a/qva/vendor/common/location_app.te
+++ b/qva/vendor/common/location_app.te
@@ -29,4 +29,4 @@
# that will be part of system image. Eg: XT app.
# allow location_app to access perf hal
-hal_client_domain(location_app, hal_perf)
+hal_client_domain(location_app, vendor_hal_perf)
diff --git a/qva/vendor/common/mdm_helper.te b/qva/vendor/common/mdm_helper.te
index 5da248c..41d32d3 100644
--- a/qva/vendor/common/mdm_helper.te
+++ b/qva/vendor/common/mdm_helper.te
@@ -25,38 +25,38 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#Policy for mdm_helper
-#mdm_helper - mdm_helper domain
-type mdm_helper, domain;
-type mdm_helper_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(mdm_helper);
+#Policy for vendor_mdm_helper
+#vendor_mdm_helper - vendor_mdm_helper domain
+type vendor_mdm_helper, domain;
+type vendor_mdm_helper_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_mdm_helper);
#block_suspend capability is needed by kickstart(ks)
-wakelock_use(mdm_helper)
+wakelock_use(vendor_mdm_helper)
#Needed to power on the peripheral
-allow mdm_helper ssr_device:chr_file r_file_perms;
+allow vendor_mdm_helper vendor_ssr_device:chr_file r_file_perms;
#Needed to access the esoc device to control the mdm
-allow mdm_helper esoc_device:dir r_dir_perms;
-allow mdm_helper esoc_device:chr_file rw_file_perms;
+allow vendor_mdm_helper vendor_esoc_device:dir r_dir_perms;
+allow vendor_mdm_helper vendor_esoc_device:chr_file rw_file_perms;
#Needed in order to run kickstart
-allow mdm_helper vendor_shell_exec:file rx_file_perms;
-allow mdm_helper mdm_helper_exec :file x_file_perms;
+allow vendor_mdm_helper vendor_shell_exec:file rx_file_perms;
+allow vendor_mdm_helper vendor_mdm_helper_exec :file x_file_perms;
userdebug_or_eng(`
#Needed for ram dump storage
-allow mdm_helper vendor_tombstone_data_file:dir create_dir_perms;
-allow mdm_helper vendor_tombstone_data_file:file create_file_perms;
+allow vendor_mdm_helper vendor_tombstone_data_file:dir create_dir_perms;
+allow vendor_mdm_helper vendor_tombstone_data_file:file create_file_perms;
')
#Needed by ks in order to access the efs sync partitions.
-allow mdm_helper block_device:dir r_dir_perms;
-allow mdm_helper efs_boot_dev:blk_file rw_file_perms;
+allow vendor_mdm_helper block_device:dir r_dir_perms;
+allow vendor_mdm_helper vendor_efs_boot_dev:blk_file rw_file_perms;
#Needed in order to access the firmware partition
-r_dir_file(mdm_helper, firmware_file)
+r_dir_file(vendor_mdm_helper, firmware_file)
#Needed to allow boot over PCIe
-allow mdm_helper mhi_device:chr_file rw_file_perms;
+allow vendor_mdm_helper vendor_mhi_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/mediacodec.te b/qva/vendor/common/mediacodec.te
index 3221655..d6c5beb 100644
--- a/qva/vendor/common/mediacodec.te
+++ b/qva/vendor/common/mediacodec.te
@@ -27,13 +27,13 @@
#WFD
#Allow mediacodec to access service manager wfdnativemm_service
-allow mediacodec wfdnativemm_service:service_manager find;
+allow mediacodec vendor_wfdnativemm_service:service_manager find;
allow mediacodec audio_device:chr_file rw_file_perms;
-binder_call(mediacodec, wifidisplayhalservice_qti);
+binder_call(mediacodec, vendor_wifidisplayhalservice_qti);
get_prop(mediacodec, vendor_video_prop)
#Allow mediacodec to access vpp
-hal_client_domain(mediacodec, hal_vpp)
-allow mediacodec xdsp_device:chr_file r_file_perms;
-allow mediacodec qdsp_device:chr_file r_file_perms;
+hal_client_domain(mediacodec, vendor_hal_vpp)
+allow mediacodec vendor_xdsp_device:chr_file r_file_perms;
+allow mediacodec vendor_qdsp_device:chr_file r_file_perms;
diff --git a/qva/vendor/common/mlid.te b/qva/vendor/common/mlid.te
index 54b58f5..17817b5 100644
--- a/qva/vendor/common/mlid.te
+++ b/qva/vendor/common/mlid.te
@@ -25,12 +25,12 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# mlid - Mink-Lowi Interface daemon
-type mlid, domain, mlstrustedsubject;
-type mlid_exec, exec_type, vendor_file_type, file_type;
+# vendor_mlid - Mink-Lowi Interface daemon
+type vendor_mlid, domain, mlstrustedsubject;
+type vendor_mlid_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(mlid)
+init_daemon_domain(vendor_mlid)
# Allow access to location socket
-allow mlid self:netlink_generic_socket create_socket_perms_no_ioctl;
-unix_socket_connect(mlid, location, location)
+allow vendor_mlid self:netlink_generic_socket create_socket_perms_no_ioctl;
+unix_socket_connect(vendor_mlid, vendor_location, vendor_location)
diff --git a/qva/vendor/common/mmi.te b/qva/vendor/common/mmi.te
index 9a569e6..c82d4b9 100755
--- a/qva/vendor/common/mmi.te
+++ b/qva/vendor/common/mmi.te
@@ -37,12 +37,12 @@
#For various devices
allow vendor_mmi {
- sysfs_soc
+ vendor_sysfs_soc
sysfs_devices_system_cpu
- sysfs_usb_supply
- sysfs_battery_supply
+ vendor_sysfs_usb_supply
+ vendor_sysfs_battery_supply
sysfs_power
- sysfs_graphics
+ vendor_sysfs_graphics
sysfs_wake_lock
}:file rw_file_perms;
@@ -57,8 +57,8 @@
hal_client_domain(vendor_mmi, hal_graphics_allocator);
#mmi test case
-unix_socket_connect(vendor_mmi, cnd, cnd);
-unix_socket_connect(vendor_mmi, netmgrd, netmgrd);
+unix_socket_connect(vendor_mmi, vendor_cnd, vendor_cnd);
+unix_socket_connect(vendor_mmi, vendor_netmgrd, vendor_netmgrd);
net_domain(vendor_mmi);
allow vendor_mmi vendor_mmi_exec:file rx_file_perms;
allow vendor_mmi proc:file r_file_perms;
diff --git a/qva/vendor/common/mmi_sys.te b/qva/vendor/common/mmi_sys.te
index 18afa98..6abb3d4 100755
--- a/qva/vendor/common/mmi_sys.te
+++ b/qva/vendor/common/mmi_sys.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#mmi_sys basic
-r_dir_file(vendor_mmi_sys, sysfs_graphics)
+r_dir_file(vendor_mmi_sys, vendor_sysfs_graphics)
hal_client_domain(vendor_mmi_sys, vendor_hal_factory_qti);
diff --git a/qva/vendor/common/netmgrd.te b/qva/vendor/common/netmgrd.te
index 5a2768f..2231c9b 100644
--- a/qva/vendor/common/netmgrd.te
+++ b/qva/vendor/common/netmgrd.te
@@ -26,34 +26,34 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
userdebug_or_eng(`
- domain_auto_trans(shell, netmgrd_exec, netmgrd)
- diag_use(netmgrd)
+ domain_auto_trans(shell, vendor_netmgrd_exec, vendor_netmgrd)
+ diag_use(vendor_netmgrd)
diag_use(netutils_wrapper)
')
-#Allow netmgrd operations
-allow netmgrd netmgrd:capability {
+#Allow vendor_netmgrd operations
+allow vendor_netmgrd vendor_netmgrd:capability {
fsetid
};
#Allow logging
-allow netmgrd smem_log_device:chr_file rw_file_perms;
+allow vendor_netmgrd vendor_smem_log_device:chr_file rw_file_perms;
-allow netmgrd netutils_wrapper:process sigkill;
+allow vendor_netmgrd netutils_wrapper:process sigkill;
#Allow operations on different types of sockets
-allow netmgrd netmgrd:rawip_socket { create getopt setopt write };
+allow vendor_netmgrd vendor_netmgrd:rawip_socket { create getopt setopt write };
-unix_socket_connect(netmgrd, cnd, cnd);
+unix_socket_connect(vendor_netmgrd, vendor_cnd, vendor_cnd);
-allow netmgrd { wcnss_service_exec vendor_shell_exec }:file rx_file_perms;
+allow vendor_netmgrd { vendor_wcnss_service_exec vendor_shell_exec }:file rx_file_perms;
-allowxperm netmgrd self:udp_socket ioctl rmnet_sock_ioctls;
+allowxperm vendor_netmgrd self:udp_socket ioctl rmnet_sock_ioctls;
-# Allow netmgrd to set vendor properties
-set_prop(netmgrd, vendor_data_ko_prop)
-allow netmgrd self:qipcrtr_socket create_socket_perms_no_ioctl;
+# Allow vendor_netmgrd to set vendor properties
+set_prop(vendor_netmgrd, vendor_data_ko_prop)
+allow vendor_netmgrd self:qipcrtr_socket create_socket_perms_no_ioctl;
-#Allow netmgrd to set rmnet module parameters
-allow netmgrd sysfs_rmnet:dir r_dir_perms;
-allow netmgrd sysfs_rmnet:file rw_file_perms;
+#Allow vendor_netmgrd to set rmnet module parameters
+allow vendor_netmgrd vendor_sysfs_rmnet:dir r_dir_perms;
+allow vendor_netmgrd vendor_sysfs_rmnet:file rw_file_perms;
diff --git a/qva/vendor/common/nfc.te b/qva/vendor/common/nfc.te
index b189cfa..98c0e35 100644
--- a/qva/vendor/common/nfc.te
+++ b/qva/vendor/common/nfc.te
@@ -28,4 +28,4 @@
# Get NFC properties
get_prop(nfc, vendor_nfc_nq_prop)
# allow nfc to access perf hal
-hal_client_domain(nfc, hal_perf)
+hal_client_domain(nfc, vendor_hal_perf)
diff --git a/qva/vendor/common/nqnfcinfo.te b/qva/vendor/common/nqnfcinfo.te
index d07f634..9ac9a42 100644
--- a/qva/vendor/common/nqnfcinfo.te
+++ b/qva/vendor/common/nqnfcinfo.te
@@ -25,13 +25,13 @@
#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type nqnfcinfo, domain;
-type nqnfcinfo_exec, exec_type, vendor_file_type, file_type;
+type vendor_nqnfcinfo, domain;
+type vendor_nqnfcinfo_exec, exec_type, vendor_file_type, file_type;
# Started by init
-init_daemon_domain(nqnfcinfo)
+init_daemon_domain(vendor_nqnfcinfo)
-set_prop(nqnfcinfo, vendor_nfc_nq_prop);
+set_prop(vendor_nqnfcinfo, vendor_nfc_nq_prop);
# Access device nodes inside /dev/nq-nci
-allow nqnfcinfo nfc_device:chr_file rw_file_perms;
+allow vendor_nqnfcinfo nfc_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/perfdump_app.te b/qva/vendor/common/perfdump_app.te
index ac52d2e..27d3b16 100644
--- a/qva/vendor/common/perfdump_app.te
+++ b/qva/vendor/common/perfdump_app.te
@@ -25,41 +25,41 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type perfdump_app, domain;
-app_domain(perfdump_app)
+type vendor_perfdump_app, domain;
+app_domain(vendor_perfdump_app)
# shared_prefs in /data/data/com.qualcomm.qti.perfdump
-allow perfdump_app system_app_data_file:dir create_dir_perms;
-allow perfdump_app system_app_data_file:file create_file_perms;
+allow vendor_perfdump_app system_app_data_file:dir create_dir_perms;
+allow vendor_perfdump_app system_app_data_file:file create_file_perms;
# systrace support
userdebug_or_eng(`
- allow perfdump_app debugfs_tracing_debug:dir r_dir_perms;
- allow perfdump_app debugfs_tracing_debug:file rw_file_perms;
- allow perfdump_app debugfs_tracing:dir r_dir_perms;
- allow perfdump_app debugfs_tracing:file rw_file_perms;
- allow perfdump_app debugfs_trace_marker:file getattr;
+ allow vendor_perfdump_app debugfs_tracing_debug:dir r_dir_perms;
+ allow vendor_perfdump_app debugfs_tracing_debug:file rw_file_perms;
+ allow vendor_perfdump_app debugfs_tracing:dir r_dir_perms;
+ allow vendor_perfdump_app debugfs_tracing:file rw_file_perms;
+ allow vendor_perfdump_app debugfs_trace_marker:file getattr;
')
# perfdump sets debug.atrace.* properties
-set_prop(perfdump_app, debug_prop)
+set_prop(vendor_perfdump_app, debug_prop)
# pokes binder-enabled processes
-binder_use(perfdump_app)
-allow perfdump_app servicemanager:service_manager list;
-allow perfdump_app hwservicemanager:hwservice_manager list;
-allow perfdump_app app_api_service:service_manager find;
-allow perfdump_app surfaceflinger_service:service_manager find;
-allow perfdump_app audioserver_service:service_manager find;
-allow perfdump_app mediaserver_service:service_manager find;
-binder_call(perfdump_app, system_server)
+binder_use(vendor_perfdump_app)
+allow vendor_perfdump_app servicemanager:service_manager list;
+allow vendor_perfdump_app hwservicemanager:hwservice_manager list;
+allow vendor_perfdump_app app_api_service:service_manager find;
+allow vendor_perfdump_app surfaceflinger_service:service_manager find;
+allow vendor_perfdump_app audioserver_service:service_manager find;
+allow vendor_perfdump_app mediaserver_service:service_manager find;
+binder_call(vendor_perfdump_app, system_server)
# dumpstate
# TODO(b/142498985): review sepolicy neverallow violation
-#set_prop(perfdump_app, ctl_dumpstate_prop)
-unix_socket_connect(perfdump_app, dumpstate, dumpstate)
+#set_prop(vendor_perfdump_app, ctl_dumpstate_prop)
+unix_socket_connect(vendor_perfdump_app, dumpstate, dumpstate)
-dontaudit perfdump_app service_manager_type:service_manager *;
-dontaudit perfdump_app hwservice_manager_type:hwservice_manager *;
+dontaudit vendor_perfdump_app service_manager_type:service_manager *;
+dontaudit vendor_perfdump_app hwservice_manager_type:hwservice_manager *;
diff --git a/qva/vendor/common/perfservice.te b/qva/vendor/common/perfservice.te
index 1eeda21..128e678 100644
--- a/qva/vendor/common/perfservice.te
+++ b/qva/vendor/common/perfservice.te
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(perfservice, hal_perf)
-hal_client_domain(perfservice, hal_iop)
+hal_client_domain(perfservice, vendor_hal_perf)
+hal_client_domain(perfservice, vendor_hal_iop)
get_prop(perfservice, vendor_iop_prop)
diff --git a/qva/vendor/common/platform_app.te b/qva/vendor/common/platform_app.te
index 9339c64..d149a58 100644
--- a/qva/vendor/common/platform_app.te
+++ b/qva/vendor/common/platform_app.te
@@ -27,22 +27,22 @@
#allow embms app to access vendor radio property
#perf
-hal_client_domain(platform_app, hal_perf)
+hal_client_domain(platform_app, vendor_hal_perf)
#cvp
-hal_client_domain(platform_app, hal_cvp)
+hal_client_domain(platform_app, vendor_hal_cvp)
#scve
-hal_client_domain(platform_app, hal_scve)
+hal_client_domain(platform_app, vendor_hal_scve)
#allow platform_app to read vendor_mpctl_prop
get_prop(platform_app, vendor_mpctl_prop)
#qspmhal
-hal_client_domain(platform_app, hal_qspmhal)
+hal_client_domain(platform_app, vendor_hal_qspmhal)
#fingerprint
hal_client_domain(platform_app, hal_fingerprint)
# allow platform_app to interact with pasr hal
-hal_client_domain(platform_app, hal_pasrmanager)
+hal_client_domain(platform_app, vendor_hal_pasrmanager)
#fm
-hal_client_domain(platform_app, hal_fm);
+hal_client_domain(platform_app, vendor_hal_fm);
# fm_radio app needes open read on fm_radio_device
-allow platform_app fm_radio_device:chr_file r_file_perms;
+allow platform_app vendor_fm_radio_device:chr_file r_file_perms;
#allow platform_app to access btconfigstore hal
-hal_client_domain(platform_app, hal_btconfigstore);
+hal_client_domain(platform_app, vendor_hal_btconfigstore);
diff --git a/qva/vendor/common/priv_app.te b/qva/vendor/common/priv_app.te
index 7375e84..6b298d4 100644
--- a/qva/vendor/common/priv_app.te
+++ b/qva/vendor/common/priv_app.te
@@ -26,6 +26,6 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#allow priv_app to access hal_qspmhal
-hal_client_domain(priv_app, hal_qspmhal)
+hal_client_domain(priv_app, vendor_hal_qspmhal)
diff --git a/qva/vendor/common/property.te b/qva/vendor/common/property.te
index db4135c..cf2baf7 100644
--- a/qva/vendor/common/property.te
+++ b/qva/vendor/common/property.te
@@ -25,11 +25,10 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qcom_ims_prop, property_type;
+type vendor_qcom_ims_prop, property_type;
type vendor_dataadpl_prop, property_type;
-type vendor_ipacm-diag_prop, property_type;
-type cnd_vendor_prop, property_type;
-type spcomlib_prop, property_type;
+type vendor_cnd_vendor_prop, property_type;
+type vendor_spcomlib_prop, property_type;
type vendor_qdma_prop, property_type;
type vendor_mdm_helper_prop, property_type;
type vendor_disable_spu_prop, property_type;
@@ -39,10 +38,10 @@
#mpctl
type vendor_mpctl_prop, property_type;
-type freq_prop, property_type;
+type vendor_freq_prop, property_type;
#service opts
-type bservice_prop, property_type;
-type reschedule_service_prop, property_type;
+type vendor_bservice_prop, property_type;
+type vendor_reschedule_service_prop, property_type;
type vendor_cgroup_follow_prop, property_type;
type vendor_scroll_prop, property_type;
@@ -54,7 +53,7 @@
type vendor_nfc_nq_prop, property_type;
# factory properties
-type ctl_vendor_mmid_prop, property_type;
+type vendor_ctl_vendor_mmid_prop, property_type;
# mmi
type vendor_mmi_prop, property_type;
@@ -68,14 +67,14 @@
# Seccam Prop
type vendor_core_ctl_prop, property_type;
-# property for location
-type location_prop, property_type;
+# property for vendor_location
+type vendor_location_prop, property_type;
# Netmgrd prop
type vendor_data_ko_prop, property_type;
# WIGIG
type vendor_wigig_prop, property_type;
-type ctl_vendor_wigigsvc_prop, property_type;
+type vendor_ctl_vendor_wigigsvc_prop, property_type;
# hvdcp_opti prop
type vendor_hvdcp_opti_prop, property_type;
@@ -87,4 +86,4 @@
type vendor_qvr_prop, property_type;
#qmuxd property
-type ctl_qmuxd_prop, property_type;
+type vendor_ctl_qmuxd_prop, property_type;
diff --git a/qva/vendor/common/property_contexts b/qva/vendor/common/property_contexts
index 8c14656..e4a9d55 100644
--- a/qva/vendor/common/property_contexts
+++ b/qva/vendor/common/property_contexts
@@ -25,14 +25,14 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-persist.vendor.ims.disabled u:object_r:qcom_ims_prop:s0
-vendor.service.qti.ims.enabled u:object_r:qcom_ims_prop:s0
-ctl.vendor.cnd u:object_r:cnd_vendor_prop:s0
-persist.vendor.cne. u:object_r:cnd_vendor_prop:s0
-persist.vendor.cnd. u:object_r:cnd_vendor_prop:s0
+persist.vendor.ims.disabled u:object_r:vendor_qcom_ims_prop:s0
+vendor.service.qti.ims.enabled u:object_r:vendor_qcom_ims_prop:s0
+ctl.vendor.cnd u:object_r:vendor_cnd_vendor_prop:s0
+persist.vendor.cne. u:object_r:vendor_cnd_vendor_prop:s0
+persist.vendor.cnd. u:object_r:vendor_cnd_vendor_prop:s0
ctl.vendor.dataadpl u:object_r:vendor_dataadpl_prop:s0
-vendor.spcom. u:object_r:spcomlib_prop:s0
+vendor.spcom. u:object_r:vendor_spcomlib_prop:s0
persist.vendor.bt.soc.scram_freqs u:object_r:vendor_bluetooth_prop:s0
ctl.vendor.mdm_helper u:object_r:vendor_mdm_helper_prop:s0
@@ -53,8 +53,8 @@
ro.vendor.qti.cgroup_follow.enable u:object_r:vendor_cgroup_follow_prop:s0
ro.vendor.qti.cgroup_follow.dex2oat_only u:object_r:vendor_cgroup_follow_prop:s0
#Bservice Property, Delayed Service Restart Property
-ro.vendor.qti.sys.fw.bservice_ u:object_r:bservice_prop:s0
-ro.vendor.qti.am.reschedule_service u:object_r:reschedule_service_prop:s0
+ro.vendor.qti.sys.fw.bservice_ u:object_r:vendor_bservice_prop:s0
+ro.vendor.qti.am.reschedule_service u:object_r:vendor_reschedule_service_prop:s0
#gesture-fling scroll
vendor.perf.gestureflingboost.enable u:object_r:vendor_scroll_prop:s0
@@ -72,7 +72,7 @@
vendor.video.disable.ubwc u:object_r:vendor_video_prop:s0
# factory properties
-ctl.vendor.mmid u:object_r:ctl_vendor_mmid_prop:s0
+ctl.vendor.mmid u:object_r:vendor_ctl_vendor_mmid_prop:s0
#seccam hal_service
vendor.hyp_core_ctl u:object_r:vendor_core_ctl_prop:s0
@@ -80,12 +80,12 @@
persist.vendor.mmi. u:object_r:vendor_mmi_prop:s0
# izat location property
-vendor.qti.izat. u:object_r:location_prop:s0
+vendor.qti.izat. u:object_r:vendor_location_prop:s0
# WIGIG
vendor.wigig. u:object_r:vendor_wigig_prop:s0
-ctl.vendor.wigig_supplicant u:object_r:ctl_vendor_wigigsvc_prop:s0
-ctl.vendor.wigig_hostapd u:object_r:ctl_vendor_wigigsvc_prop:s0
-ctl.vendor.sensingdaemon u:object_r:ctl_vendor_wigigsvc_prop:s0
+ctl.vendor.wigig_supplicant u:object_r:vendor_ctl_vendor_wigigsvc_prop:s0
+ctl.vendor.wigig_hostapd u:object_r:vendor_ctl_vendor_wigigsvc_prop:s0
+ctl.vendor.sensingdaemon u:object_r:vendor_ctl_vendor_wigigsvc_prop:s0
# netmgrd ko loading
persist.vendor.data.shs_ko_load u:object_r:vendor_data_ko_prop:s0
@@ -116,7 +116,7 @@
vendor.qvr u:object_r:vendor_qvr_prop:s0
#qmuxd property
-ctl.start$vendor.qmuxd u:object_r:ctl_qmuxd_prop:s0
+ctl.start$vendor.qmuxd u:object_r:vendor_ctl_qmuxd_prop:s0
#bluetooth property
-ro.vendor.bt.enablelazyhal u:object_r:bluetooth_prop:s0 exact bool
+ro.vendor.bt.enablelazyhal u:object_r:vendor_bluetooth_prop:s0 exact bool
diff --git a/qva/vendor/common/qcomsysd.te b/qva/vendor/common/qcomsysd.te
index 57c2990..d155837 100755
--- a/qva/vendor/common/qcomsysd.te
+++ b/qva/vendor/common/qcomsysd.te
@@ -32,14 +32,14 @@
init_daemon_domain(vendor_qcomsysd);
#Needed for logging
-allow vendor_qcomsysd smem_log_device:chr_file rw_file_perms;
+allow vendor_qcomsysd vendor_smem_log_device:chr_file rw_file_perms;
#Needed to read/write cookies to the misc partition
allow vendor_qcomsysd block_device:dir r_dir_perms;
#Needed to get image info from socinfo
-r_dir_file(vendor_qcomsysd, sysfs_soc)
-allow vendor_qcomsysd sysfs_soc:file w_file_perms;
+r_dir_file(vendor_qcomsysd, vendor_sysfs_soc)
+allow vendor_qcomsysd vendor_sysfs_soc:file w_file_perms;
allow vendor_qcomsysd self:socket create;
allow vendor_qcomsysd self:capability { sys_boot };
@@ -52,7 +52,7 @@
userdebug_or_eng(`
diag_use(vendor_qcomsysd)
set_prop(vendor_qcomsysd, powerctl_prop)
- allow vendor_qcomsysd sysfs_qdss_dev:dir r_dir_perms;
- allow vendor_qcomsysd sysfs_qdss_dev:file rw_file_perms;
- allow vendor_qcomsysd sysfs_data:file r_file_perms;
+ allow vendor_qcomsysd vendor_sysfs_qdss_dev:dir r_dir_perms;
+ allow vendor_qcomsysd vendor_sysfs_qdss_dev:file rw_file_perms;
+ allow vendor_qcomsysd vendor_sysfs_data:file r_file_perms;
')
diff --git a/qva/vendor/common/qdma_app.te b/qva/vendor/common/qdma_app.te
index 983ee44..298ab94 100644
--- a/qva/vendor/common/qdma_app.te
+++ b/qva/vendor/common/qdma_app.te
@@ -25,52 +25,52 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qdma_app, domain, mlstrustedsubject;
-app_domain(qdma_app)
-net_domain(qdma_app)
-binder_use(qdma_app)
+type vendor_qdma_app, domain, mlstrustedsubject;
+app_domain(vendor_qdma_app)
+net_domain(vendor_qdma_app)
+binder_use(vendor_qdma_app)
-# allow invoking activity and access app content to qdma_app
-allow qdma_app { activity_service content_service }:service_manager find;
-# allow display service to qdma_app
-allow qdma_app { display_service }:service_manager find;
-# allow access to wifi and data network to qdma_app
-allow qdma_app { connectivity_service network_management_service }:service_manager find;
-# allow access telephony service info to qdma_app
-allow qdma_app { radio_service registry_service }:service_manager find;
-# allow acquire wakelock to qdma_app
-allow qdma_app { power_service }:service_manager find;
+# allow invoking activity and access app content to vendor_qdma_app
+allow vendor_qdma_app { activity_service content_service }:service_manager find;
+# allow display service to vendor_qdma_app
+allow vendor_qdma_app { display_service }:service_manager find;
+# allow access to wifi and data network to vendor_qdma_app
+allow vendor_qdma_app { connectivity_service network_management_service }:service_manager find;
+# allow access telephony service info to vendor_qdma_app
+allow vendor_qdma_app { radio_service registry_service }:service_manager find;
+# allow acquire wakelock to vendor_qdma_app
+allow vendor_qdma_app { power_service }:service_manager find;
# allow to load native library
-allow qdma_app { mount_service }:service_manager find;
+allow vendor_qdma_app { mount_service }:service_manager find;
# for vendor_perf_service
-allow qdma_app app_api_service:service_manager find;
+allow vendor_qdma_app app_api_service:service_manager find;
# allow access to qdma dropbox
-allow qdma_app vendor_qdma_data_file:dir create_dir_perms;
-allow qdma_app vendor_qdma_data_file:file create_file_perms;
+allow vendor_qdma_app vendor_qdma_data_file:dir create_dir_perms;
+allow vendor_qdma_app vendor_qdma_data_file:file create_file_perms;
-allow qdma_app user_service:service_manager find;
+allow vendor_qdma_app user_service:service_manager find;
# allow access to socket
-unix_socket_connect(qdma_app, dpmtcm, dpmd)
+unix_socket_connect(vendor_qdma_app, dpmtcm, dpmd)
# allow qdma_socket
-allow qdma_app qdma_socket:dir w_dir_perms;
-allow qdma_app qdma_socket:sock_file create_file_perms;
+allow vendor_qdma_app vendor_qdma_socket:dir w_dir_perms;
+allow vendor_qdma_app vendor_qdma_socket:sock_file create_file_perms;
# for /dev/socket/qdma/qdma-campmgr-s
-unix_socket_connect(qdma_app, qdma, qdmastatsd)
+unix_socket_connect(vendor_qdma_app, vendor_qdma, vendor_qdmastatsd)
# allow access to mediadrmserver for qdmastats/wvstats
-allow qdma_app mediadrmserver_service:service_manager find;
+allow vendor_qdma_app mediadrmserver_service:service_manager find;
-# allow qdma_app to access system_app_data_file
+# allow vendor_qdma_app to access system_app_data_file
# necessary for read and write /data/data subdirectory.
-allow qdma_app system_app_data_file:dir create_dir_perms;
-allow qdma_app system_app_data_file:file create_file_perms;
+allow vendor_qdma_app system_app_data_file:dir create_dir_perms;
+allow vendor_qdma_app system_app_data_file:file create_file_perms;
# allow qdma_prop
-set_prop(qdma_app, vendor_qdma_prop);
+set_prop(vendor_qdma_app, vendor_qdma_prop);
# allow cgroup access
-allow qdma_app cgroup:file rw_file_perms;
+allow vendor_qdma_app cgroup:file rw_file_perms;
diff --git a/qva/vendor/common/qdmastatsd.te b/qva/vendor/common/qdmastatsd.te
index c666bb6..1e8ec38 100644
--- a/qva/vendor/common/qdmastatsd.te
+++ b/qva/vendor/common/qdmastatsd.te
@@ -25,23 +25,23 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qdmastatsd, domain, mlstrustedsubject;
-type qdmastatsd_exec, file_type, vendor_file_type, exec_type;
+type vendor_qdmastatsd, domain, mlstrustedsubject;
+type vendor_qdmastatsd_exec, file_type, vendor_file_type, exec_type;
-init_daemon_domain(qdmastatsd)
+init_daemon_domain(vendor_qdmastatsd)
-allow qdmastatsd vendor_qdma_data_file:file create_file_perms;
-allow qdmastatsd vendor_qdma_data_file:dir create_dir_perms;
+allow vendor_qdmastatsd vendor_qdma_data_file:file create_file_perms;
+allow vendor_qdmastatsd vendor_qdma_data_file:dir create_dir_perms;
# access to /dev/ramdump_microdump_modem
-allow qdmastatsd ramdump_device:chr_file r_file_perms;
+allow vendor_qdmastatsd vendor_ramdump_device:chr_file r_file_perms;
# cpustats
# access to /sys/class/power_supply/bms/charge_counter
# access to /sys/class/power_supply/battery/capacity
# access to /sys/class/power_supply/battery/status
-allow qdmastatsd sysfs_battery_supply:{file lnk_file} r_file_perms;
-allow qdmastatsd sysfs_battery_supply:dir r_dir_perms;
+allow vendor_qdmastatsd vendor_sysfs_battery_supply:{file lnk_file} r_file_perms;
+allow vendor_qdmastatsd vendor_sysfs_battery_supply:dir r_dir_perms;
# gpustats
# /sys/class/kgsl/kgsl-3d0/gpu_busy_percentage
@@ -49,44 +49,44 @@
# /sys/class/kgsl/kgsl-3d0/gpu_clock_stats
# /sys/class/kgsl/kgsl-3d0/num_pwrlevels
# /sys/class/kgsl/kgsl-3d0/gpu_available_frequencies
-allow qdmastatsd sysfs_kgsl:{file lnk_file} r_file_perms;
-allow qdmastatsd sysfs_kgsl:dir r_dir_perms;
+allow vendor_qdmastatsd vendor_sysfs_kgsl:{file lnk_file} r_file_perms;
+allow vendor_qdmastatsd vendor_sysfs_kgsl:dir r_dir_perms;
# cpustats /sys/class/leds/lcd-backlight/brightness
-allow qdmastatsd sysfs_leds:{file lnk_file} r_file_perms;
-allow qdmastatsd sysfs_leds:dir r_dir_perms;
+allow vendor_qdmastatsd sysfs_leds:{file lnk_file} r_file_perms;
+allow vendor_qdmastatsd sysfs_leds:dir r_dir_perms;
# cpustats /sys/class/backlight/panel0-backlight/brightness
-allow qdmastatsd sysfs_graphics:{file lnk_file} r_file_perms;
-allow qdmastatsd sysfs_graphics:dir r_dir_perms;
+allow vendor_qdmastatsd vendor_sysfs_graphics:{file lnk_file} r_file_perms;
+allow vendor_qdmastatsd vendor_sysfs_graphics:dir r_dir_perms;
# cpustats /sys/class/thermal/thermal_zone%d
-allow qdmastatsd sysfs_thermal:{file lnk_file} r_file_perms;
-allow qdmastatsd sysfs_thermal:dir r_dir_perms;
+allow vendor_qdmastatsd sysfs_thermal:{file lnk_file} r_file_perms;
+allow vendor_qdmastatsd sysfs_thermal:dir r_dir_perms;
# cpustats /proc/stat
-allow qdmastatsd proc_stat:file r_file_perms;
-allow qdmastatsd proc_stat:dir r_dir_perms;
+allow vendor_qdmastatsd proc_stat:file r_file_perms;
+allow vendor_qdmastatsd proc_stat:dir r_dir_perms;
# cpustats /proc/<pid>/
-r_dir_file(qdmastatsd, domain);
+r_dir_file(vendor_qdmastatsd, domain);
# lmtp qdma_socket
-allow qdmastatsd qdma_socket:dir rw_dir_perms;
-allow qdmastatsd qdma_socket:sock_file create_file_perms;
+allow vendor_qdmastatsd vendor_qdma_socket:dir rw_dir_perms;
+allow vendor_qdmastatsd vendor_qdma_socket:sock_file create_file_perms;
# mps /persist/hlos_rfs/shared
-allow qdmastatsd mnt_vendor_file:dir r_dir_perms;
-allow qdmastatsd persist_rfs_shared_hlos_file:dir rw_dir_perms;
-allow qdmastatsd persist_rfs_shared_hlos_file:file create_file_perms;
+allow vendor_qdmastatsd mnt_vendor_file:dir r_dir_perms;
+allow vendor_qdmastatsd vendor_persist_rfs_shared_hlos_file:dir rw_dir_perms;
+allow vendor_qdmastatsd vendor_persist_rfs_shared_hlos_file:file create_file_perms;
# for logcat
-unix_socket_connect(qdmastatsd, logdr, logd);
+unix_socket_connect(vendor_qdmastatsd, logdr, logd);
# allow qdma_prop
-set_prop(qdmastatsd, vendor_qdma_prop);
+set_prop(vendor_qdmastatsd, vendor_qdma_prop);
# qmi
-qmux_socket(qdmastatsd);
-allow qdmastatsd self:{ socket qipcrtr_socket } create_socket_perms;
-allowxperm qdmastatsd self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
+qmux_socket(vendor_qdmastatsd);
+allow vendor_qdmastatsd self:{ socket qipcrtr_socket } create_socket_perms;
+allowxperm vendor_qdmastatsd self:{ socket qipcrtr_socket } ioctl msm_sock_ipc_ioctls;
diff --git a/qva/vendor/common/qfp-daemon.te b/qva/vendor/common/qfp-daemon.te
index 9d4582f..5ae5b64 100644
--- a/qva/vendor/common/qfp-daemon.te
+++ b/qva/vendor/common/qfp-daemon.te
@@ -26,35 +26,35 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#qfp daemon for ultrasonic fingerprint sensor
-type qfp-daemon, domain;
-type qfp-daemon_exec, exec_type, vendor_file_type, file_type;
+type vendor_qfp-daemon, domain;
+type vendor_qfp-daemon_exec, exec_type, vendor_file_type, file_type;
-hal_server_domain(qfp-daemon, hal_fingerprint)
-init_daemon_domain(qfp-daemon)
+hal_server_domain(vendor_qfp-daemon, hal_fingerprint)
+init_daemon_domain(vendor_qfp-daemon)
-allow qfp-daemon qfp-daemon_data_file:dir { rw_dir_perms setattr };
-allow qfp-daemon qfp-daemon_data_file:file create_file_perms;
+allow vendor_qfp-daemon vendor_qfp-daemon_data_file:dir { rw_dir_perms setattr };
+allow vendor_qfp-daemon vendor_qfp-daemon_data_file:file create_file_perms;
-allow qfp-daemon sysfs_touch_aoi:dir r_dir_perms;
-allow qfp-daemon sysfs_touch_aoi:file rw_file_perms;
+allow vendor_qfp-daemon vendor_sysfs_touch_aoi:dir r_dir_perms;
+allow vendor_qfp-daemon vendor_sysfs_touch_aoi:file rw_file_perms;
# Access to tee_device
-allow qfp-daemon tee_device:chr_file rw_file_perms;
+allow vendor_qfp-daemon tee_device:chr_file rw_file_perms;
# Read system property
-allow qfp-daemon property_socket:sock_file write;
+allow vendor_qfp-daemon property_socket:sock_file write;
# RW to device driver
-allow qfp-daemon qbt_device:chr_file rw_file_perms;
+allow vendor_qfp-daemon vendor_qbt_device:chr_file rw_file_perms;
# R dir perms for firmware dir
-r_dir_file(qfp-daemon, firmware_file)
+r_dir_file(vendor_qfp-daemon, firmware_file)
# R dir perms for persist qc_senseid dir
-r_dir_file(qfp-daemon, mnt_vendor_file)
-r_dir_file(qfp-daemon, persist_qti_fp_file)
+r_dir_file(vendor_qfp-daemon, mnt_vendor_file)
+r_dir_file(vendor_qfp-daemon, vendor_persist_qti_fp_file)
#diag
userdebug_or_eng(`
- diag_use(qfp-daemon)
+ diag_use(vendor_qfp-daemon)
')
diff --git a/qva/vendor/common/qmuxd.te b/qva/vendor/common/qmuxd.te
index 511d627..af224b4 100644
--- a/qva/vendor/common/qmuxd.te
+++ b/qva/vendor/common/qmuxd.te
@@ -25,9 +25,9 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qmuxd, domain;
-type qmuxd_exec, exec_type, vendor_file_type, file_type;
+type vendor_qmuxd, domain;
+type vendor_qmuxd_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(qmuxd)
-net_domain(qmuxd)
-set_prop(qmuxd, ctl_qmuxd_prop)
+init_daemon_domain(vendor_qmuxd)
+net_domain(vendor_qmuxd)
+set_prop(vendor_qmuxd, vendor_ctl_qmuxd_prop)
diff --git a/qva/vendor/common/qrtr.te b/qva/vendor/common/qrtr.te
index f94657d..e4abe45 100644
--- a/qva/vendor/common/qrtr.te
+++ b/qva/vendor/common/qrtr.te
@@ -25,16 +25,16 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qrtr, domain;
-type qrtr_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(qrtr)
+type vendor_qrtr, domain;
+type vendor_qrtr_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_qrtr)
-allow qrtr self:{
+allow vendor_qrtr self:{
socket
qipcrtr_socket
} create_socket_perms;
-allowxperm qrtr self:{ socket qipcrtr_socket } ioctl msm_sock_qrtr_ioctls;
-allow qrtr devpts:chr_file rw_file_perms;
+allowxperm vendor_qrtr self:{ socket qipcrtr_socket } ioctl msm_sock_qrtr_ioctls;
+allow vendor_qrtr devpts:chr_file rw_file_perms;
-allow qrtr self:capability { net_bind_service };
+allow vendor_qrtr self:capability { net_bind_service };
diff --git a/qva/vendor/common/qseecomd.te b/qva/vendor/common/qseecomd.te
index 036653c..561cadf 100644
--- a/qva/vendor/common/qseecomd.te
+++ b/qva/vendor/common/qseecomd.te
@@ -26,13 +26,13 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Allow access to qsee_ipc_irq_spss device
-allow tee qsee_ipc_irq_spss_device:chr_file rw_file_perms;
+allow tee vendor_qsee_ipc_irq_spss_device:chr_file rw_file_perms;
allow tee tee_device:chr_file rw_file_perms;
-hal_client_domain(tee, hal_soter);
+hal_client_domain(tee, vendor_hal_soter);
unix_socket_connect(tee, property, init)
# Allow access to qsee data file
-allow tee data_qsee_file:dir create_dir_perms;
-allow tee data_qsee_file:file create_file_perms;
+allow tee vendor_data_qsee_file:dir create_dir_perms;
+allow tee vendor_data_qsee_file:file create_file_perms;
# allow tee access for secure UI to work
allow tee graphics_device:dir r_dir_perms;
allow tee graphics_device:chr_file r_file_perms;
@@ -40,9 +40,9 @@
wakelock_use(tee)
r_dir_file(tee, firmware_file)
-allow tee qfp-daemon_data_file:dir create_dir_perms;
-allow tee qfp-daemon_data_file:file create_file_perms;
-allow tee persist_qti_fp_file:dir create_dir_perms;
-allow tee persist_qti_fp_file:file create_file_perms;
+allow tee vendor_qfp-daemon_data_file:dir create_dir_perms;
+allow tee vendor_qfp-daemon_data_file:file create_file_perms;
+allow tee vendor_persist_qti_fp_file:dir create_dir_perms;
+allow tee vendor_persist_qti_fp_file:file create_file_perms;
-allowxperm tee rpmb_device:blk_file ioctl { MMC_IOC_CMD };
+allowxperm tee vendor_rpmb_device:blk_file ioctl { MMC_IOC_CMD };
diff --git a/qva/vendor/common/qspmhal.te b/qva/vendor/common/qspmhal.te
index e56f565..7835895 100644
--- a/qva/vendor/common/qspmhal.te
+++ b/qva/vendor/common/qspmhal.te
@@ -25,24 +25,24 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_qspmhal_default, domain;
-type hal_qspmhal_default_exec, exec_type, vendor_file_type, file_type;
-typeattribute hal_qspmhal_default untrusted_app_visible_halserver_violators;
+type vendor_hal_qspmhal_default, domain;
+type vendor_hal_qspmhal_default_exec, exec_type, vendor_file_type, file_type;
+typeattribute vendor_hal_qspmhal_default untrusted_app_visible_halserver_violators;
-init_daemon_domain(hal_qspmhal_default)
+init_daemon_domain(vendor_hal_qspmhal_default)
-hal_server_domain(hal_qspmhal_default, hal_qspmhal)
-hal_client_domain(hal_qspmhal_default, hal_allocator)
+hal_server_domain(vendor_hal_qspmhal_default, vendor_hal_qspmhal)
+hal_client_domain(vendor_hal_qspmhal_default, hal_allocator)
-binder_call(hal_qspmhal_client, hal_qspmhal_server)
-binder_call(hal_qspmhal_server, hal_qspmhal_client)
+binder_call(vendor_hal_qspmhal_client, vendor_hal_qspmhal_server)
+binder_call(vendor_hal_qspmhal_server, vendor_hal_qspmhal_client)
# Add hwservice related rules
-hal_attribute_hwservice(hal_qspmhal, hal_qspmhal_hwservice)
+hal_attribute_hwservice(vendor_hal_qspmhal, vendor_hal_qspmhal_hwservice)
#Add permission to create/write file
-allow hal_qspmhal_default vendor_qspmhal_data_file:file create_file_perms;
-allow hal_qspmhal_default vendor_qspmhal_data_file:dir rw_dir_perms;
+allow vendor_hal_qspmhal_default vendor_qspmhal_data_file:file create_file_perms;
+allow vendor_hal_qspmhal_default vendor_qspmhal_data_file:dir rw_dir_perms;
#getprop rule for qspm debug prop
-userdebug_or_eng(`get_prop(hal_qspmhal_default, vendor_qspm_dbg_prop)')
+userdebug_or_eng(`get_prop(vendor_hal_qspmhal_default, vendor_qspm_dbg_prop)')
diff --git a/qva/vendor/common/qspmsvc.te b/qva/vendor/common/qspmsvc.te
index 6aa18e9..130cff2 100644
--- a/qva/vendor/common/qspmsvc.te
+++ b/qva/vendor/common/qspmsvc.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(qspmsvc, hal_qspmhal)
+hal_client_domain(qspmsvc, vendor_hal_qspmhal)
diff --git a/qva/vendor/common/qtelephony.te b/qva/vendor/common/qtelephony.te
index 19e8b47..85ed434 100644
--- a/qva/vendor/common/qtelephony.te
+++ b/qva/vendor/common/qtelephony.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Allow qtelephony to access perf hal
-hal_client_domain(qtelephony, hal_perf);
+hal_client_domain(qtelephony, vendor_hal_perf);
diff --git a/qva/vendor/common/qti.te b/qva/vendor/common/qti.te
index 73127b8..3c61454 100644
--- a/qva/vendor/common/qti.te
+++ b/qva/vendor/common/qti.te
@@ -25,23 +25,23 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow qti {
- smem_log_device
- mhi_device
+allow vendor_qti {
+ vendor_smem_log_device
+ vendor_mhi_device
userdebug_or_eng(`kmsg_device')
}:chr_file rw_file_perms;
-allow qti self:{
+allow vendor_qti self:{
netlink_socket
udp_socket
} create_socket_perms_no_ioctl;
-allow qti self:udp_socket ioctl;
+allow vendor_qti self:udp_socket ioctl;
-allow qti vendor_shell_exec:file rx_file_perms;
+allow vendor_qti vendor_shell_exec:file rx_file_perms;
# Allow write permissions for log file
userdebug_or_eng(`
- allow qti vendor_qti_data_file:file create_file_perms;
+ allow vendor_qti vendor_qti_data_file:file create_file_perms;
')
-dontaudit qti shell_exec:file x_file_perms;
+dontaudit vendor_qti vendor_shell_exec:file x_file_perms;
diff --git a/qva/vendor/common/qvrd.te b/qva/vendor/common/qvrd.te
index d7e0663..ba15b1d 100644
--- a/qva/vendor/common/qvrd.te
+++ b/qva/vendor/common/qvrd.te
@@ -29,16 +29,16 @@
# General
#
-userdebug_or_eng(` allow qvrd diag_device:chr_file rw_file_perms');
+userdebug_or_eng(` allow qvrd vendor_diag_device:chr_file rw_file_perms');
#r_dir_file(qvrd, vendor_file)
-r_dir_file(qvrd, sysfs_kgsl)
+r_dir_file(qvrd, vendor_sysfs_kgsl)
#
# Sensors
#
# Allow access to ADSP & SLPI
-allow qvrd { ion_device qdsp_device dsp_device xdsp_device }:chr_file r_file_perms;
+allow qvrd { ion_device vendor_qdsp_device vendor_dsp_device vendor_xdsp_device }:chr_file r_file_perms;
#
@@ -46,7 +46,7 @@
#
# Allow access to /sys/devices/virtual/graphics/fb* for lineptr interrupts
-allow qvrd sysfs_graphics:file r_file_perms;
+allow qvrd vendor_sysfs_graphics:file r_file_perms;
#
# Camera
@@ -63,7 +63,7 @@
# Perfd
#
-hal_client_domain(qvrd, hal_perf)
+hal_client_domain(qvrd, vendor_hal_perf)
allow qvrd fwk_sensor_hwservice:hwservice_manager find;
hal_client_domain(qvrd, hal_sensors)
@@ -71,19 +71,19 @@
# QVRD
userdebug_or_eng(`
allow qvrd debugfs:dir r_dir_perms;
-allow qvrd qti_debugfs:dir r_dir_perms;
-allow qvrd qti_debugfs:file rw_file_perms;
+allow qvrd vendor_qti_debugfs:dir r_dir_perms;
+allow qvrd vendor_qti_debugfs:file rw_file_perms;
')
# Allow access to kgsl sysfs nodes for performance optimization
-allow qvrd sysfs_kgsl:file r_file_perms;
+allow qvrd vendor_sysfs_kgsl:file r_file_perms;
# Allow access to qvr_external_sensor sysfs nodes for external viewers
-allow qvrd sysfs_qvr_external_sensor:dir r_dir_perms;
-allow qvrd sysfs_qvr_external_sensor:file rw_file_perms;
+allow qvrd vendor_sysfs_qvr_external_sensor:dir r_dir_perms;
+allow qvrd vendor_sysfs_qvr_external_sensor:file rw_file_perms;
# Allow access to qvr_external_sensor device nodes for external viewers
-allow qvrd qvr_external_sensor_device:chr_file rw_file_perms;
+allow qvrd vendor_qvr_external_sensor_device:chr_file rw_file_perms;
# qvr properties
get_prop(qvrd, vendor_qvr_prop)
diff --git a/qva/vendor/common/radio.te b/qva/vendor/common/radio.te
index e7c9ecc..aa56f41 100644
--- a/qva/vendor/common/radio.te
+++ b/qva/vendor/common/radio.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#qspm
-hal_client_domain(radio, hal_qspmhal)
+hal_client_domain(radio, vendor_hal_qspmhal)
diff --git a/qva/vendor/common/seapp_contexts b/qva/vendor/common/seapp_contexts
index d4bef3a..d47a978 100644
--- a/qva/vendor/common/seapp_contexts
+++ b/qva/vendor/common/seapp_contexts
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#Add new domain for perfdump app
-user=system seinfo=platform name=com.qualcomm.qti.perfdump domain=perfdump_app type=system_app_data_file
+user=system seinfo=platform name=com.qualcomm.qti.perfdump domain=vendor_perfdump_app type=system_app_data_file
#Add new domain for QDMA
-user=system seinfo=platform name=com.qualcomm.qti.qdma domain=qdma_app type=system_app_data_file
+user=system seinfo=platform name=com.qualcomm.qti.qdma domain=vendor_qdma_app type=system_app_data_file
diff --git a/qva/vendor/common/sec_nvm.te b/qva/vendor/common/sec_nvm.te
index 239875b..5ade3f0 100644
--- a/qva/vendor/common/sec_nvm.te
+++ b/qva/vendor/common/sec_nvm.te
@@ -25,20 +25,20 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# sec_nvm service
-type sec_nvm, domain;
+# vendor_sec_nvm service
+type vendor_sec_nvm, domain;
-type sec_nvm_exec, exec_type, vendor_file_type, file_type;
+type vendor_sec_nvm_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(sec_nvm)
-allow sec_nvm ion_device:chr_file rw_file_perms;
-allow sec_nvm skp_device:chr_file { getattr rw_file_perms };
+init_daemon_domain(vendor_sec_nvm)
+allow vendor_sec_nvm ion_device:chr_file rw_file_perms;
+allow vendor_sec_nvm vendor_skp_device:chr_file { getattr rw_file_perms };
-allow sec_nvm mnt_vendor_file:dir search;
-allow sec_nvm persist_secnvm_file:dir rw_dir_perms;
-allow sec_nvm persist_secnvm_file:file create_file_perms;
+allow vendor_sec_nvm mnt_vendor_file:dir search;
+allow vendor_sec_nvm vendor_persist_secnvm_file:dir rw_dir_perms;
+allow vendor_sec_nvm vendor_persist_secnvm_file:file create_file_perms;
-allow sec_nvm spcom_device:chr_file { getattr rw_file_perms };
-allow sec_nvm sp_ssr_device:chr_file rw_file_perms;
-set_prop(sec_nvm, spcomlib_prop)
-allow sec_nvm sec_nvm_device:chr_file rw_file_perms;
+allow vendor_sec_nvm vendor_spcom_device:chr_file { getattr rw_file_perms };
+allow vendor_sec_nvm vendor_sp_ssr_device:chr_file rw_file_perms;
+set_prop(vendor_sec_nvm, vendor_spcomlib_prop)
+allow vendor_sec_nvm vendor_sec_nvm_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/seccam_app.te b/qva/vendor/common/seccam_app.te
index ef8415d..425fc54 100644
--- a/qva/vendor/common/seccam_app.te
+++ b/qva/vendor/common/seccam_app.te
@@ -25,17 +25,17 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type seccam_app, domain;
-app_domain(seccam_app)
-net_domain(seccam_app)
+type vendor_seccam_app, domain;
+app_domain(vendor_seccam_app)
+net_domain(vendor_seccam_app)
-hal_client_domain(seccam_app, hal_seccam);
-hal_client_domain(seccam_app, hal_qteeconnector);
+hal_client_domain(vendor_seccam_app, vendor_hal_seccam);
+hal_client_domain(vendor_seccam_app, vendor_hal_qteeconnector);
-allow seccam_app system_app_data_file:dir create_dir_perms;
-allow seccam_app system_app_data_file:file create_file_perms;
-allow seccam_app { activity_service app_api_service } :service_manager find;
-allow seccam_app self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow vendor_seccam_app system_app_data_file:dir create_dir_perms;
+allow vendor_seccam_app system_app_data_file:file create_file_perms;
+allow vendor_seccam_app { activity_service app_api_service } :service_manager find;
+allow vendor_seccam_app self:qipcrtr_socket create_socket_perms_no_ioctl;
#qspm
-hal_client_domain(seccam_app, hal_qspmhal)
+hal_client_domain(vendor_seccam_app, vendor_hal_qspmhal)
diff --git a/qva/vendor/common/secure_element.te b/qva/vendor/common/secure_element.te
index ce0953d..a33d9c2 100644
--- a/qva/vendor/common/secure_element.te
+++ b/qva/vendor/common/secure_element.te
@@ -26,4 +26,4 @@
#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#allow secure_element to access perf hal
-hal_client_domain(secure_element, hal_perf)
+hal_client_domain(secure_element, vendor_hal_perf)
diff --git a/qva/vendor/common/seemp_health_daemon.te b/qva/vendor/common/seemp_health_daemon.te
index 428bc90..11e6ae7 100644
--- a/qva/vendor/common/seemp_health_daemon.te
+++ b/qva/vendor/common/seemp_health_daemon.te
@@ -25,10 +25,10 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type seemp_health_daemon, domain;
-type seemp_health_daemon_exec, exec_type, vendor_file_type, file_type;
+type vendor_seemp_health_daemon, domain;
+type vendor_seemp_health_daemon_exec, exec_type, vendor_file_type, file_type;
-#Allow for transition from init domain to seemp_health_daemon
-init_daemon_domain(seemp_health_daemon)
+#Allow for transition from init domain to vendor_seemp_health_daemon
+init_daemon_domain(vendor_seemp_health_daemon)
#Allow access to tee device
-allow seemp_health_daemon tee_device:chr_file rw_file_perms;
+allow vendor_seemp_health_daemon tee_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/sensingdaemon.te b/qva/vendor/common/sensingdaemon.te
index 75ba51c..9795843 100644
--- a/qva/vendor/common/sensingdaemon.te
+++ b/qva/vendor/common/sensingdaemon.te
@@ -25,17 +25,17 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sensingdaemon, domain;
-type sensingdaemon_exec, exec_type, vendor_file_type, file_type;
+type vendor_sensingdaemon, domain;
+type vendor_sensingdaemon_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(sensingdaemon)
+init_daemon_domain(vendor_sensingdaemon)
-#listen on /dev/socket/sensingdaemon
-allow sensingdaemon self:unix_stream_socket { listen accept read write };
+#listen on /dev/socket/vendor_sensingdaemon
+allow vendor_sensingdaemon self:unix_stream_socket { listen accept read write };
# Allow access to create socket
-allow sensingdaemon self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow vendor_sensingdaemon self:qipcrtr_socket create_socket_perms_no_ioctl;
# Allow access to create data output files
-allow sensingdaemon sensing_vendor_data_file:dir rw_dir_perms;
-allow sensingdaemon sensing_vendor_data_file:file create_file_perms;
+allow vendor_sensingdaemon vendor_sensing_vendor_data_file:dir rw_dir_perms;
+allow vendor_sensingdaemon vendor_sensing_vendor_data_file:file create_file_perms;
diff --git a/qva/vendor/common/service.te b/qva/vendor/common/service.te
index cb25e99..ff2dac1 100644
--- a/qva/vendor/common/service.te
+++ b/qva/vendor/common/service.te
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type dun_service, service_manager_type;
-type imsrcs_service, service_manager_type;
-type qtitetherservice_service, service_manager_type;
\ No newline at end of file
+type vendor_dun_service, service_manager_type;
+type vendor_imsrcs_service, service_manager_type;
+type vendor_qtitetherservice_service, service_manager_type;
diff --git a/qva/vendor/common/spdaemon.te b/qva/vendor/common/spdaemon.te
index 2385da1..a2a84d8 100644
--- a/qva/vendor/common/spdaemon.te
+++ b/qva/vendor/common/spdaemon.te
@@ -25,31 +25,31 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# spdaemon service
-type spdaemon, domain;
+# vendor_spdaemon service
+type vendor_spdaemon, domain;
-type spdaemon_exec, exec_type, vendor_file_type, file_type;
+type vendor_spdaemon_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(spdaemon)
-allow spdaemon spcom_device:chr_file { getattr rw_file_perms };
-allow spdaemon skp_device:chr_file { getattr rw_file_perms };
+init_daemon_domain(vendor_spdaemon)
+allow vendor_spdaemon vendor_spcom_device:chr_file { getattr rw_file_perms };
+allow vendor_spdaemon vendor_skp_device:chr_file { getattr rw_file_perms };
# Need to check if really needed
-set_prop(spdaemon, spcomlib_prop)
-allow spdaemon spdaemon_ssr_device:chr_file rw_file_perms;
-allow spdaemon sp_ssr_device:chr_file rw_file_perms;
-allow spdaemon sp_keymaster_device:chr_file rw_file_perms;
-allow spdaemon cryptoapp_device:chr_file rw_file_perms;
-allow spdaemon iuicc_device:chr_file rw_file_perms;
-allow spdaemon ion_device:chr_file rw_file_perms;
-r_dir_file(spdaemon, firmware_file);
-use_vendor_per_mgr(spdaemon)
-hal_client_domain(spdaemon, hal_telephony)
+set_prop(vendor_spdaemon, vendor_spcomlib_prop)
+allow vendor_spdaemon vendor_spdaemon_ssr_device:chr_file rw_file_perms;
+allow vendor_spdaemon vendor_sp_ssr_device:chr_file rw_file_perms;
+allow vendor_spdaemon vendor_sp_keymaster_device:chr_file rw_file_perms;
+allow vendor_spdaemon vendor_cryptoapp_device:chr_file rw_file_perms;
+allow vendor_spdaemon vendor_iuicc_device:chr_file rw_file_perms;
+allow vendor_spdaemon ion_device:chr_file rw_file_perms;
+r_dir_file(vendor_spdaemon, firmware_file);
+use_vendor_per_mgr(vendor_spdaemon)
+hal_client_domain(vendor_spdaemon, hal_telephony)
-allow spdaemon sysfs_data:file r_file_perms;
+allow vendor_spdaemon vendor_sysfs_data:file r_file_perms;
-allow spdaemon sysfs_spdaemon:file r_file_perms;
+allow vendor_spdaemon vendor_sysfs_spdaemon:file r_file_perms;
userdebug_or_eng(`
-allow spdaemon debugfs_ipc:file rw_file_perms;
-allow spdaemon debugfs_ipc:dir r_dir_perms;
+allow vendor_spdaemon vendor_debugfs_ipc:file rw_file_perms;
+allow vendor_spdaemon vendor_debugfs_ipc:dir r_dir_perms;
')
diff --git a/qva/vendor/common/ssgqmigd.te b/qva/vendor/common/ssgqmigd.te
index 35c6483..4dbbea4 100644
--- a/qva/vendor/common/ssgqmigd.te
+++ b/qva/vendor/common/ssgqmigd.te
@@ -25,10 +25,10 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ssgqmigd - SSG QMI Gateway Daemon
-type ssgqmigd, domain, mlstrustedsubject;
-type ssgqmigd_exec, exec_type, vendor_file_type, file_type;
+# vendor_ssgqmigd - SSG QMI Gateway Daemon
+type vendor_ssgqmigd, domain, mlstrustedsubject;
+type vendor_ssgqmigd_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(ssgqmigd)
+init_daemon_domain(vendor_ssgqmigd)
-allow ssgqmigd self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow vendor_ssgqmigd self:qipcrtr_socket create_socket_perms_no_ioctl;
diff --git a/qva/vendor/common/ssgtzd.te b/qva/vendor/common/ssgtzd.te
index b917d9e..64b36e9 100644
--- a/qva/vendor/common/ssgtzd.te
+++ b/qva/vendor/common/ssgtzd.te
@@ -25,16 +25,16 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ssgtzd - SSG TZ Daemon
-type ssgtzd, domain, mlstrustedsubject;
-type ssgtzd_exec, exec_type, vendor_file_type, file_type;
+# vendor_ssgtzd - SSG TZ Daemon
+type vendor_ssgtzd, domain, mlstrustedsubject;
+type vendor_ssgtzd_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(ssgtzd)
+init_daemon_domain(vendor_ssgtzd)
#Allow access to smcinvoke device
-allow ssgtzd smcinvoke_device:chr_file rw_file_perms;
+allow vendor_ssgtzd smcinvoke_device:chr_file rw_file_perms;
-allow ssgtzd ssg_app:unix_stream_socket connectto;
+allow vendor_ssgtzd vendor_ssg_app:unix_stream_socket connectto;
#Allow access to firmware/image
-allow ssgtzd vendor_firmware_file:dir r_dir_perms;
-allow ssgtzd vendor_firmware_file:file r_file_perms;
+allow vendor_ssgtzd vendor_firmware_file:dir r_dir_perms;
+allow vendor_ssgtzd vendor_firmware_file:file r_file_perms;
diff --git a/qva/vendor/common/surfaceflinger.te b/qva/vendor/common/surfaceflinger.te
index 50ce808..544c917 100644
--- a/qva/vendor/common/surfaceflinger.te
+++ b/qva/vendor/common/surfaceflinger.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-r_dir_file(surfaceflinger, sysfs_qfprom)
+r_dir_file(surfaceflinger, vendor_sysfs_qfprom)
diff --git a/qva/vendor/common/sysmonapp/seapp_contexts b/qva/vendor/common/sysmonapp/seapp_contexts
index 4cd7e0b..7c16ae0 100644
--- a/qva/vendor/common/sysmonapp/seapp_contexts
+++ b/qva/vendor/common/sysmonapp/seapp_contexts
@@ -26,8 +26,8 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# sysmonapp applications
-user=_app seinfo=sysmonapp domain=sysmonapp_app name=com.qualcomm.sysmonappInternal type=app_data_file levelFrom=all
-user=_app seinfo=sysmonapp domain=sysmonapp_app name=com.qualcomm.qti.sysmonappExternal type=app_data_file levelFrom=all
+user=_app seinfo=sysmonapp domain=vendor_sysmonapp_app name=com.qualcomm.sysmonappInternal type=app_data_file levelFrom=all
+user=_app seinfo=sysmonapp domain=vendor_sysmonapp_app name=com.qualcomm.qti.sysmonappExternal type=app_data_file levelFrom=all
#Add new domain for secure camera service app
-user=system seinfo=platform name=com.qualcomm.qti.seccamservice:remote domain=seccam_app type=system_app_data_file
+user=system seinfo=platform name=com.qualcomm.qti.seccamservice:remote domain=vendor_seccam_app type=system_app_data_file
diff --git a/qva/vendor/common/sysmonapp/sysmonapp_app.te b/qva/vendor/common/sysmonapp/sysmonapp_app.te
index f2d1482..e69a61c 100644
--- a/qva/vendor/common/sysmonapp/sysmonapp_app.te
+++ b/qva/vendor/common/sysmonapp/sysmonapp_app.te
@@ -25,19 +25,19 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-## sysmonapp_app
-## This file defines permissions that sysmonapp_app can carry
+## vendor_sysmonapp_app
+## This file defines permissions that vendor_sysmonapp_app can carry
-type sysmonapp_app, domain;
-app_domain(sysmonapp_app);
+type vendor_sysmonapp_app, domain;
+app_domain(vendor_sysmonapp_app);
# For service manager access
-allow sysmonapp_app app_api_service:service_manager find;
+allow vendor_sysmonapp_app app_api_service:service_manager find;
# For access to camera and media
-allow sysmonapp_app cameraserver_service:service_manager find;
-allow sysmonapp_app mediaserver_service:service_manager find;
+allow vendor_sysmonapp_app cameraserver_service:service_manager find;
+allow vendor_sysmonapp_app mediaserver_service:service_manager find;
# To access FastRPC devices
-allow sysmonapp_app qdsp_device:chr_file r_file_perms;
-allow sysmonapp_app xdsp_device:chr_file r_file_perms;
+allow vendor_sysmonapp_app vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_sysmonapp_app vendor_xdsp_device:chr_file r_file_perms;
diff --git a/qva/vendor/common/system_app.te b/qva/vendor/common/system_app.te
index ae3bd38..50326a6 100644
--- a/qva/vendor/common/system_app.te
+++ b/qva/vendor/common/system_app.te
@@ -28,25 +28,34 @@
#allow system_app access factory
hal_client_domain(system_app, vendor_hal_factory_qti);
+hal_client_domain(system_app, vendor_hal_fm);
+
+# fm_radio app needes open read on fm_radio_device
+allow system_app vendor_fm_radio_device:chr_file r_file_perms;
#allow system_app access sensorscalibration service
-hal_client_domain(system_app, hal_sensorscalibrate_qti);
+hal_client_domain(system_app, vendor_hal_sensorscalibrate_qti);
#perf
-hal_client_domain(system_app, hal_perf)
+hal_client_domain(system_app, vendor_hal_perf)
#allow system_app to interact with soter hal
-hal_client_domain(system_app, hal_soter);
+hal_client_domain(system_app, vendor_hal_soter);
#allow system app access display color for qdcm
-hal_client_domain(system_app, hal_display_color);
+hal_client_domain(system_app, vendor_hal_display_color);
# allow system_app to interact with light hal
hal_client_domain(system_app, hal_light);
+#allow system app to access btconfigstore hal
+hal_client_domain(system_app, vendor_hal_btconfigstore);
# update engine
binder_call( system_app, update_engine )
#allow system app to access hal_qspmhal
-hal_client_domain(system_app, hal_qspmhal);
+hal_client_domain(system_app, vendor_hal_qspmhal);
+
+# allow system_app to interact with pasr hal
+hal_client_domain(system_app, vendor_hal_pasrmanager)
diff --git a/qva/vendor/common/system_server.te b/qva/vendor/common/system_server.te
index b6976d7..3da5536 100644
--- a/qva/vendor/common/system_server.te
+++ b/qva/vendor/common/system_server.te
@@ -26,39 +26,39 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
##for perf-hal/iop-hal call
-hal_client_domain(system_server, hal_perf)
-hal_client_domain(system_server, hal_iop)
-hal_client_domain(system_server, hal_srvctracker)
+hal_client_domain(system_server, vendor_hal_perf)
+hal_client_domain(system_server, vendor_hal_iop)
+hal_client_domain(system_server, vendor_hal_srvctracker)
-binder_call(system_server, hal_srvctracker_default)
+binder_call(system_server, vendor_hal_srvctracker_default)
-allow system_server proc_audiod:file r_file_perms;
+allow system_server vendor_proc_audiod:file r_file_perms;
# allow system_server to access IOP HAL service
-hal_client_domain(system_server, hal_iop)
+hal_client_domain(system_server, vendor_hal_iop)
# allow system_server to access vendor perf properties
get_prop(system_server, vendor_iop_prop)
-get_prop(system_server, bservice_prop)
-get_prop(system_server, reschedule_service_prop)
+get_prop(system_server, vendor_bservice_prop)
+get_prop(system_server, vendor_reschedule_service_prop)
get_prop(system_server, vendor_cgroup_follow_prop)
get_prop(system_server, vendor_scroll_prop)
# allow WIGIG framework hosted in system_server to access wigig_hal
-hal_client_domain(system_server, hal_wigig)
+hal_client_domain(system_server, vendor_hal_wigig)
# allow WIGIG framework to access network performance tuner
-hal_client_domain(system_server, hal_wigig_npt)
+hal_client_domain(system_server, vendor_hal_wigig_npt)
# allow WIGIG framework to access the capability config store
-hal_client_domain(system_server, hal_capabilityconfigstore_qti);
+hal_client_domain(system_server, vendor_hal_capabilityconfigstore_qti);
# allow WIFI framework to access the fst-manager
-hal_client_domain(system_server, hal_fstman)
+hal_client_domain(system_server, vendor_hal_fstman)
# allow WIGIG framework access to wil6210 sysfs files like thermal_throttling
-allow system_server sysfs_wigig:file rw_file_perms;
+allow system_server vendor_sysfs_wigig:file rw_file_perms;
# allow system_server to access IWifiStats HAL service
-hal_client_domain(system_server, hal_wifilearner);
+hal_client_domain(system_server, vendor_hal_wifilearner);
# allow system_server to access Qspmhal
-hal_client_domain(system_server, hal_qspmhal);
+hal_client_domain(system_server, vendor_hal_qspmhal);
get_prop(system_server, vendor_qspm_prop)
diff --git a/qva/vendor/common/untrusted_app.te b/qva/vendor/common/untrusted_app.te
index 522ed8b..dd930a6 100644
--- a/qva/vendor/common/untrusted_app.te
+++ b/qva/vendor/common/untrusted_app.te
@@ -25,5 +25,5 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(untrusted_app, hal_qspmhal)
+hal_client_domain(untrusted_app, vendor_hal_qspmhal)
diff --git a/qva/vendor/common/untrusted_app_25.te b/qva/vendor/common/untrusted_app_25.te
index b5c85aa..04ab686 100644
--- a/qva/vendor/common/untrusted_app_25.te
+++ b/qva/vendor/common/untrusted_app_25.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(untrusted_app_25, hal_qspmhal)
+hal_client_domain(untrusted_app_25, vendor_hal_qspmhal)
diff --git a/qva/vendor/common/untrusted_app_27.te b/qva/vendor/common/untrusted_app_27.te
index 61b4d00..fb5a32a 100644
--- a/qva/vendor/common/untrusted_app_27.te
+++ b/qva/vendor/common/untrusted_app_27.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(untrusted_app_27, hal_qspmhal)
+hal_client_domain(untrusted_app_27, vendor_hal_qspmhal)
diff --git a/qva/vendor/common/vendor_audioftm.te b/qva/vendor/common/vendor_audioftm.te
index 734e7e4..fc4c12d 100644
--- a/qva/vendor/common/vendor_audioftm.te
+++ b/qva/vendor/common/vendor_audioftm.te
@@ -33,8 +33,8 @@
allow vendor_audioftm vendor_audioftm_exec:file { rx_file_perms entrypoint };
-allow vendor_audioftm proc_audiod:file r_file_perms;
-allow vendor_audioftm proc_audiod:dir search;
+allow vendor_audioftm vendor_proc_audiod:file r_file_perms;
+allow vendor_audioftm vendor_proc_audiod:dir search;
allow vendor_audioftm proc_asound:dir search;
diff --git a/qva/vendor/common/vndservice.te b/qva/vendor/common/vndservice.te
index 2b50862..4658d3a 100644
--- a/qva/vendor/common/vndservice.te
+++ b/qva/vendor/common/vndservice.te
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type esepmdaemon_service, vndservice_manager_type;
-type wfdnativemm_service, vndservice_manager_type;
-type wfdhdcpvndservice_service, vndservice_manager_type;
+type vendor_esepmdaemon_service, vndservice_manager_type;
+type vendor_wfdnativemm_service, vndservice_manager_type;
+type vendor_wfdhdcpvndservice_service, vndservice_manager_type;
diff --git a/qva/vendor/common/vndservice_contexts b/qva/vendor/common/vndservice_contexts
index c1cde38..60820be 100644
--- a/qva/vendor/common/vndservice_contexts
+++ b/qva/vendor/common/vndservice_contexts
@@ -26,5 +26,5 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#WFD
-wfd.native.mm.service u:object_r:wfdnativemm_service:s0
-wfdhdcpvndservice u:object_r:wfdhdcpvndservice_service:s0
+wfd.native.mm.service u:object_r:vendor_wfdnativemm_service:s0
+wfdhdcpvndservice u:object_r:vendor_wfdhdcpvndservice_service:s0
diff --git a/qva/vendor/common/vppservice.te b/qva/vendor/common/vppservice.te
index e064d12..598748b 100644
--- a/qva/vendor/common/vppservice.te
+++ b/qva/vendor/common/vppservice.te
@@ -31,12 +31,12 @@
init_daemon_domain(vendor_vppservice)
-hal_server_domain(vendor_vppservice, hal_vpp)
+hal_server_domain(vendor_vppservice, vendor_hal_vpp)
-hal_attribute_hwservice(hal_vpp, hal_vpp_hwservice)
+hal_attribute_hwservice(vendor_hal_vpp, vendor_hal_vpp_hwservice)
-binder_call(hal_vpp_client, hal_vpp_server)
-binder_call(hal_vpp_server, hal_vpp_client)
+binder_call(vendor_hal_vpp_client, vendor_hal_vpp_server)
+binder_call(vendor_hal_vpp_server, vendor_hal_vpp_client)
# allow vppservice to access adsprpcd
r_dir_file(vendor_vppservice, adsprpcd_file);
@@ -49,15 +49,15 @@
allow vendor_vppservice vendor_vpp_data_file:file create_file_perms;
# allow access to vppservice (/persist/vpp)
-r_dir_file(vendor_vppservice, persist_vpp_file)
+r_dir_file(vendor_vppservice, vendor_persist_vpp_file)
allow vendor_vppservice mnt_vendor_file:dir search;
# allow vppservice to access ion, video device & qdsp_device
allow vendor_vppservice ion_device:chr_file rw_file_perms;
allow vendor_vppservice video_device:chr_file rw_file_perms;
-allow vendor_vppservice qdsp_device:chr_file r_file_perms;
-allow vendor_vppservice xdsp_device:chr_file r_file_perms;
+allow vendor_vppservice vendor_qdsp_device:chr_file r_file_perms;
+allow vendor_vppservice vendor_xdsp_device:chr_file r_file_perms;
allow vendor_vppservice gpu_device:chr_file rw_file_perms;
hal_client_domain(vendor_vppservice, hal_graphics_allocator)
-hal_client_domain(vendor_vppservice, hal_capabilityconfigstore_qti)
+hal_client_domain(vendor_vppservice, vendor_hal_capabilityconfigstore_qti)
diff --git a/qva/vendor/common/vpsservice.te b/qva/vendor/common/vpsservice.te
index ca98cad..7a1e784 100755
--- a/qva/vendor/common/vpsservice.te
+++ b/qva/vendor/common/vpsservice.te
@@ -26,6 +26,6 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
hwbinder_use(vpsservice);
-hal_client_domain(vpsservice, hal_vpp)
-hal_client_domain(vpsservice, hal_iop)
+hal_client_domain(vpsservice, vendor_hal_vpp)
+hal_client_domain(vpsservice, vendor_hal_iop)
get_prop(vpsservice, vendor_iop_prop)
diff --git a/qva/vendor/common/wcnss_service.te b/qva/vendor/common/wcnss_service.te
index c241919..c5d72ee 100644
--- a/qva/vendor/common/wcnss_service.te
+++ b/qva/vendor/common/wcnss_service.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# allow access to network performance tuner
-unix_socket_connect(wcnss_service, wigignpt, wigignpt)
+unix_socket_connect(vendor_wcnss_service, vendor_wigignpt, vendor_wigignpt)
# allow net admin to cnss-daemon
-allow wcnss_service self:capability net_admin;
+allow vendor_wcnss_service self:capability net_admin;
diff --git a/qva/vendor/common/wfdhdcphalservice.te b/qva/vendor/common/wfdhdcphalservice.te
index 3c03739..020d3b8 100644
--- a/qva/vendor/common/wfdhdcphalservice.te
+++ b/qva/vendor/common/wfdhdcphalservice.te
@@ -26,20 +26,20 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#Define Domain
-type wfdhdcphalservice_qti, domain;
-type wfdhdcphalservice_qti_exec, exec_type, vendor_file_type, file_type;
+type vendor_wfdhdcphalservice_qti, domain;
+type vendor_wfdhdcphalservice_qti_exec, exec_type, vendor_file_type, file_type;
-hal_server_domain(wfdhdcphalservice_qti, hal_drm)
-init_daemon_domain(wfdhdcphalservice_qti)
+hal_server_domain(vendor_wfdhdcphalservice_qti, hal_drm)
+init_daemon_domain(vendor_wfdhdcphalservice_qti)
#Allow to call wfdhdcpvndservice
-vndbinder_use(wfdhdcphalservice_qti)
-allow wfdhdcphalservice_qti wfdhdcpvndservice_service:service_manager find;
-binder_call(wfdhdcphalservice_qti, wfdvndservice);
+vndbinder_use(vendor_wfdhdcphalservice_qti)
+allow vendor_wfdhdcphalservice_qti vendor_wfdhdcpvndservice_service:service_manager find;
+binder_call(vendor_wfdhdcphalservice_qti, vendor_wfdvndservice);
#Allow access to display config hal
-hal_client_domain(wfdhdcphalservice_qti, hal_graphics_composer)
+hal_client_domain(vendor_wfdhdcphalservice_qti, hal_graphics_composer)
#Allow to use fd from mediacodec and wfd app
-allow wfdhdcphalservice_qti { mediacodec system_app }:fd use;
+allow vendor_wfdhdcphalservice_qti { mediacodec system_app }:fd use;
diff --git a/qva/vendor/common/wfdservice.te b/qva/vendor/common/wfdservice.te
index 6768e86..cc03691 100644
--- a/qva/vendor/common/wfdservice.te
+++ b/qva/vendor/common/wfdservice.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-hal_client_domain(wfdservice, wifidisplayhalservice);
+hal_client_domain(wfdservice, vendor_wifidisplayhalservice);
diff --git a/qva/vendor/common/wfdvndservice.te b/qva/vendor/common/wfdvndservice.te
index 5310039..63c01dc 100644
--- a/qva/vendor/common/wfdvndservice.te
+++ b/qva/vendor/common/wfdvndservice.te
@@ -27,31 +27,31 @@
#Define Domain
-type wfdvndservice, domain;
-type wfdvndservice_exec, exec_type, vendor_file_type, file_type;
+type vendor_wfdvndservice, domain;
+type vendor_wfdvndservice_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(wfdvndservice)
+init_daemon_domain(vendor_wfdvndservice)
#Allow net for hdcp connection
-net_domain(wfdvndservice)
+net_domain(vendor_wfdvndservice)
#Allow to use Vendor Binder IPC
-vndbinder_use(wfdvndservice)
+vndbinder_use(vendor_wfdvndservice)
#Allow to host sink hdcp vnd service
-add_service(wfdvndservice, wfdhdcpvndservice_service)
-binder_call(wfdvndservice, wfdhdcphalservice_qti);
+add_service(vendor_wfdvndservice, vendor_wfdhdcpvndservice_service)
+binder_call(vendor_wfdvndservice, vendor_wfdhdcphalservice_qti);
#Allow access to firmware files for HDCP session
-r_dir_file(wfdvndservice, firmware_file)
+r_dir_file(vendor_wfdvndservice, firmware_file)
#Allow for using fds
-allow wfdvndservice { mediacodec system_app wfdhdcphalservice_qti}:fd use;
+allow vendor_wfdvndservice { mediacodec system_app vendor_wfdhdcphalservice_qti}:fd use;
#Allow access to tee/ion device
-allow wfdvndservice tee_device:chr_file rw_file_perms;
-allow wfdvndservice ion_device:chr_file r_file_perms;
+allow vendor_wfdvndservice tee_device:chr_file rw_file_perms;
+allow vendor_wfdvndservice ion_device:chr_file r_file_perms;
#Allow access to graphics_composer and qdisplay_service
-hal_client_domain(wfdvndservice, hal_graphics_composer);
-allow wfdvndservice qdisplay_service:service_manager find;
+hal_client_domain(vendor_wfdvndservice, hal_graphics_composer);
+allow vendor_wfdvndservice vendor_qdisplay_service:service_manager find;
diff --git a/qva/vendor/common/wifidisplayhalservice.te b/qva/vendor/common/wifidisplayhalservice.te
index 127f9d1..65691e6 100644
--- a/qva/vendor/common/wifidisplayhalservice.te
+++ b/qva/vendor/common/wifidisplayhalservice.te
@@ -26,87 +26,87 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#Define Domain
-type wifidisplayhalservice_qti, domain;
-type wifidisplayhalservice_qti_exec, exec_type, vendor_file_type, file_type;
+type vendor_wifidisplayhalservice_qti, domain;
+type vendor_wifidisplayhalservice_qti_exec, exec_type, vendor_file_type, file_type;
#Allow for transition from init domain to wifidisplayhalservice
-init_daemon_domain(wifidisplayhalservice_qti)
+init_daemon_domain(vendor_wifidisplayhalservice_qti)
#Inherit base network permissions from netd
-net_domain(wifidisplayhalservice_qti)
+net_domain(vendor_wifidisplayhalservice_qti)
#Allow wifidisplayhalservice to use Vendor Binder IPC
-vndbinder_use(wifidisplayhalservice)
+vndbinder_use(vendor_wifidisplayhalservice)
-hal_server_domain_bypass(wifidisplayhalservice_qti,wifidisplayhalservice)
+hal_server_domain_bypass(vendor_wifidisplayhalservice_qti,vendor_wifidisplayhalservice)
# Allow hwbinder call from hal client to server
-binder_call(wifidisplayhalservice_client, wifidisplayhalservice_server)
-binder_call(wifidisplayhalservice_server, wifidisplayhalservice_client)
+binder_call(vendor_wifidisplayhalservice_client, vendor_wifidisplayhalservice_server)
+binder_call(vendor_wifidisplayhalservice_server, vendor_wifidisplayhalservice_client)
# Add hwservice related rules
-hal_attribute_hwservice(wifidisplayhalservice, wifidisplayhalservice_hwservice)
+hal_attribute_hwservice(vendor_wifidisplayhalservice, vendor_wifidisplayhalservice_hwservice)
#Direct streaming native service
-add_service(wifidisplayhalservice_qti, wfdnativemm_service)
+add_service(vendor_wifidisplayhalservice_qti, vendor_wfdnativemm_service)
#Allow access to firmware files for HDCP session
-r_dir_file(wifidisplayhalservice_qti, firmware_file)
+r_dir_file(vendor_wifidisplayhalservice_qti, firmware_file)
#Allow access to tee/ion device and tcp socket for HDCP sessions
-allow wifidisplayhalservice_qti tee_device:chr_file rw_file_perms;
+allow vendor_wifidisplayhalservice_qti tee_device:chr_file rw_file_perms;
#Allow access to PCM sound card
-allow wifidisplayhalservice_qti audio_device:chr_file rw_file_perms;
-allow wifidisplayhalservice_qti audio_device:dir r_dir_perms;
+allow vendor_wifidisplayhalservice_qti audio_device:chr_file rw_file_perms;
+allow vendor_wifidisplayhalservice_qti audio_device:dir r_dir_perms;
#Allow access to /dev/video/* devices for encoding/decoding
-allow wifidisplayhalservice_qti video_device:chr_file rw_file_perms;
+allow vendor_wifidisplayhalservice_qti video_device:chr_file rw_file_perms;
#Allow binder call to mediacodec from wifidisplayhalservice
-binder_call(wifidisplayhalservice_qti, mediacodec);
+binder_call(vendor_wifidisplayhalservice_qti, mediacodec);
#Allow udp socket ioctl
-allow wifidisplayhalservice_qti self:udp_socket create_socket_perms;
+allow vendor_wifidisplayhalservice_qti self:udp_socket create_socket_perms;
# ioctlcmd=8bff,8912
-allowxperm wifidisplayhalservice_qti self:udp_socket ioctl priv_sock_ioctls;
+allowxperm vendor_wifidisplayhalservice_qti self:udp_socket ioctl priv_sock_ioctls;
#Allow access to proc/net/arp
-allow wifidisplayhalservice_qti proc_net:file r_file_perms;
+allow vendor_wifidisplayhalservice_qti proc_net:file r_file_perms;
# Add the rule for wfd to access /proc/asound/pcm file
-r_dir_file(wifidisplayhalservice_qti, proc_asound)
+r_dir_file(vendor_wifidisplayhalservice_qti, proc_asound)
# Add the rule for wfd to access /proc/asound/card0/state file
-r_dir_file(wifidisplayhalservice_qti, proc_audiod)
+r_dir_file(vendor_wifidisplayhalservice_qti, vendor_proc_audiod)
#Allow hal graphics allocator permissions
-hal_client_domain(wifidisplayhalservice_qti, hal_graphics_allocator);
+hal_client_domain(vendor_wifidisplayhalservice_qti, hal_graphics_allocator);
#Allow hal graphics mapper permissions
-hal_client_domain(wifidisplayhalservice_qti, hal_graphics_composer);
+hal_client_domain(vendor_wifidisplayhalservice_qti, hal_graphics_composer);
-#Allow wifidisplayhalservice_qti to query interface name of network (p2p etc.)
-allow wifidisplayhalservice_qti self:netlink_generic_socket create_socket_perms_no_ioctl;
+#Allow vendor_wifidisplayhalservice_qti to query interface name of network (p2p etc.)
+allow vendor_wifidisplayhalservice_qti self:netlink_generic_socket create_socket_perms_no_ioctl;
#Allow communication with init over property server
-unix_socket_connect(wifidisplayhalservice_qti, property, init);
+unix_socket_connect(vendor_wifidisplayhalservice_qti, property, init);
#Allow ion device access
-allow wifidisplayhalservice_qti ion_device:chr_file r_file_perms;
+allow vendor_wifidisplayhalservice_qti ion_device:chr_file r_file_perms;
userdebug_or_eng(`
#Allow for property access
- get_prop(wifidisplayhalservice_qti,wfd_vendor_debug_prop)
+ get_prop(vendor_wifidisplayhalservice_qti,vendor_wfd_vendor_debug_prop)
#Allow to dump in /data/vendor/media/
- allow wifidisplayhalservice_qti vendor_media_data_file:dir w_dir_perms;
- allow wifidisplayhalservice_qti vendor_media_data_file:file create_file_perms;
+ allow vendor_wifidisplayhalservice_qti vendor_media_data_file:dir w_dir_perms;
+ allow vendor_wifidisplayhalservice_qti vendor_media_data_file:file create_file_perms;
#Allow to access logmask file in /data/vendor
- allow wifidisplayhalservice_qti vendor_data_file:file r_file_perms;
+ allow vendor_wifidisplayhalservice_qti vendor_data_file:file r_file_perms;
')
#Allow source to access video SKU and UBWC property(for encoder config)
-get_prop(wifidisplayhalservice_qti, vendor_video_prop)
+get_prop(vendor_wifidisplayhalservice_qti, vendor_video_prop)
#Allow access to uhid driver for HID event injection
-allow wifidisplayhalservice_qti uhid_device:chr_file rw_file_perms;
+allow vendor_wifidisplayhalservice_qti uhid_device:chr_file rw_file_perms;
diff --git a/qva/vendor/common/wifilearnersvc.te b/qva/vendor/common/wifilearnersvc.te
index fe66018..9ce2471 100644
--- a/qva/vendor/common/wifilearnersvc.te
+++ b/qva/vendor/common/wifilearnersvc.te
@@ -25,17 +25,17 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type wifilearnersvc, domain;
-type wifilearnersvc_exec, exec_type, vendor_file_type, file_type;
+type vendor_wifilearnersvc, domain;
+type vendor_wifilearnersvc_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(wifilearnersvc)
-hal_server_domain(wifilearnersvc, hal_wifilearner)
+init_daemon_domain(vendor_wifilearnersvc)
+hal_server_domain(vendor_wifilearnersvc, vendor_hal_wifilearner)
#allows calls between client and server and vice-versa
-binder_call(hal_wifilearner_client, hal_wifilearner_server)
-binder_call(hal_wifilearner_server, hal_wifilearner_client)
+binder_call(vendor_hal_wifilearner_client, vendor_hal_wifilearner_server)
+binder_call(vendor_hal_wifilearner_server, vendor_hal_wifilearner_client)
#register hal service and allow hal clients to find the service
-hal_attribute_hwservice(hal_wifilearner, hal_wifilearner_hwservice)
+hal_attribute_hwservice(vendor_hal_wifilearner, vendor_hal_wifilearner_hwservice)
-allow hal_wifilearner self:netlink_generic_socket create_socket_perms_no_ioctl;
+allow vendor_hal_wifilearner self:netlink_generic_socket create_socket_perms_no_ioctl;
diff --git a/qva/vendor/common/wigighalsvc.te b/qva/vendor/common/wigighalsvc.te
index 709f9f9..e48ccd7 100644
--- a/qva/vendor/common/wigighalsvc.te
+++ b/qva/vendor/common/wigighalsvc.te
@@ -25,43 +25,43 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type wigighalsvc, domain;
-type wigighalsvc_exec, exec_type, vendor_file_type, file_type;
+type vendor_wigighalsvc, domain;
+type vendor_wigighalsvc_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(wigighalsvc)
-hal_server_domain(wigighalsvc, hal_wigig)
+init_daemon_domain(vendor_wigighalsvc)
+hal_server_domain(vendor_wigighalsvc, vendor_hal_wigig)
# allows calls between client and server and vice-versa
-binder_call(hal_wigig_client, hal_wigig_server)
-binder_call(hal_wigig_server, hal_wigig_client)
+binder_call(vendor_hal_wigig_client, vendor_hal_wigig_server)
+binder_call(vendor_hal_wigig_server, vendor_hal_wigig_client)
# register hal service, allow hal clients to find the service
-hal_attribute_hwservice(hal_wigig, hal_wigig_hwservice)
+hal_attribute_hwservice(vendor_hal_wigig, vendor_hal_wigig_hwservice)
# allow start/stop services via ctl.start and ctl.stop
-set_prop(hal_wigig, ctl_vendor_wigigsvc_prop)
+set_prop(vendor_hal_wigig, vendor_ctl_vendor_wigigsvc_prop)
# access wigig properties, for loading wil6210 module via init
-set_prop(hal_wigig, vendor_wigig_prop);
+set_prop(vendor_hal_wigig, vendor_wigig_prop);
# access wifi vendor data files
-r_dir_file(hal_wigig, wifi_vendor_data_file)
-allow hal_wigig wifi_vendor_data_file:dir rw_dir_perms;
-allow hal_wigig wifi_vendor_data_file:file create_file_perms;
+r_dir_file(vendor_hal_wigig, vendor_wifi_vendor_data_file)
+allow vendor_hal_wigig vendor_wifi_vendor_data_file:dir rw_dir_perms;
+allow vendor_hal_wigig vendor_wifi_vendor_data_file:file create_file_perms;
# dynamically create hostapd configuration file
-allow hal_wigig hostapd_data_file:dir rw_dir_perms;
-allow hal_wigig hostapd_data_file:file create_file_perms;
+allow vendor_hal_wigig hostapd_data_file:dir rw_dir_perms;
+allow vendor_hal_wigig hostapd_data_file:file create_file_perms;
# connect to supplicant by socket
-allow hal_wigig { hal_wifi_supplicant hal_wifi_hostapd_default }:unix_dgram_socket sendto;
-allow hal_wigig wifi_vendor_wpa_socket:dir rw_dir_perms;
-allow hal_wigig wifi_vendor_wpa_socket:sock_file create_file_perms;
-allow hal_wigig wigig_vendor_wpa_socket:sock_file rw_file_perms;
+allow vendor_hal_wigig { hal_wifi_supplicant hal_wifi_hostapd_default }:unix_dgram_socket sendto;
+allow vendor_hal_wigig vendor_wifi_vendor_wpa_socket:dir rw_dir_perms;
+allow vendor_hal_wigig vendor_wifi_vendor_wpa_socket:sock_file create_file_perms;
+allow vendor_hal_wigig vendor_wigig_vendor_wpa_socket:sock_file rw_file_perms;
# connect to wigig_hostapd by socket
-allow hal_wigig wigig_hostapd_socket:dir rw_dir_perms;
-allow hal_wigig wigig_hostapd_socket:sock_file create_file_perms;
+allow vendor_hal_wigig vendor_wigig_hostapd_socket:dir rw_dir_perms;
+allow vendor_hal_wigig vendor_wigig_hostapd_socket:sock_file create_file_perms;
# check if wil6210 module is loaded
-allow hal_wigig proc_modules:file r_file_perms;
+allow vendor_hal_wigig proc_modules:file r_file_perms;
diff --git a/qva/vendor/common/wigignpt.te b/qva/vendor/common/wigignpt.te
index 787573e..62cc095 100644
--- a/qva/vendor/common/wigignpt.te
+++ b/qva/vendor/common/wigignpt.te
@@ -25,31 +25,31 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type wigignpt, domain;
-type wigignpt_exec, exec_type, vendor_file_type, file_type;
+type vendor_wigignpt, domain;
+type vendor_wigignpt_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(wigignpt)
+init_daemon_domain(vendor_wigignpt)
#use bypass because net_admin capability is needed
-hal_server_domain_bypass(wigignpt, hal_wigig_npt)
+hal_server_domain_bypass(vendor_wigignpt, vendor_hal_wigig_npt)
#allows calls between client and server and vice-versa
-binder_call(hal_wigig_npt_client, hal_wigig_npt_server)
-binder_call(hal_wigig_npt_server, hal_wigig_npt_client)
+binder_call(vendor_hal_wigig_npt_client, vendor_hal_wigig_npt_server)
+binder_call(vendor_hal_wigig_npt_server, vendor_hal_wigig_npt_client)
#register hal service, allow hal clients to find the service
-hal_attribute_hwservice(hal_wigig_npt, hal_wigig_npt_hwservice)
+hal_attribute_hwservice(vendor_hal_wigig_npt, vendor_hal_wigig_npt_hwservice)
#allow updating network stack parameters under /proc/sys/net
#this also requires net_admin capability
-allow hal_wigig_npt proc_net:file rw_file_perms;
-allow hal_wigig_npt self:capability net_admin;
+allow vendor_hal_wigig_npt proc_net:file rw_file_perms;
+allow vendor_hal_wigig_npt self:capability net_admin;
#update wigig0 network parameters like rps_cpus and gro_flush_timeout
-allow hal_wigig_npt sysfs_net:dir search;
-allow hal_wigig_npt sysfs_wigig:file rw_file_perms;
+allow vendor_hal_wigig_npt sysfs_net:dir search;
+allow vendor_hal_wigig_npt vendor_sysfs_wigig:file rw_file_perms;
#update bond0 rps_cpus (FST)
-allow hal_wigig_npt sysfs_bond0:file rw_file_perms;
+allow vendor_hal_wigig_npt vendor_sysfs_bond0:file rw_file_perms;
-#listen on /dev/socket/wigignpt
-allow hal_wigig_npt hal_wigig_npt:unix_stream_socket { listen accept read write };
+#listen on /dev/socket/vendor_wigignpt
+allow vendor_hal_wigig_npt vendor_hal_wigig_npt:unix_stream_socket { listen accept read write };
diff --git a/qva/vendor/kona/genfs_contexts b/qva/vendor/kona/genfs_contexts
index b95d547..09fe94c 100644
--- a/qva/vendor/kona/genfs_contexts
+++ b/qva/vendor/kona/genfs_contexts
@@ -26,5 +26,5 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# spdaemon sysfs
-genfscon sysfs /firmware/devicetree/base/soc/qcom,spmi@c440000/qcom,pm8150b@2/vadc@3100/vph_pwr@83/name u:object_r:sysfs_spdaemon:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,spss_utils/firmware_name u:object_r:sysfs_spdaemon:s0
+genfscon sysfs /firmware/devicetree/base/soc/qcom,spmi@c440000/qcom,pm8150b@2/vadc@3100/vph_pwr@83/name u:object_r:vendor_sysfs_spdaemon:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,spss_utils/firmware_name u:object_r:vendor_sysfs_spdaemon:s0
diff --git a/qva/vendor/kona/hal_biometricsface.te b/qva/vendor/kona/hal_biometricsface.te
index 7b5e7e3..bfb4d56 100644
--- a/qva/vendor/kona/hal_biometricsface.te
+++ b/qva/vendor/kona/hal_biometricsface.te
@@ -41,8 +41,8 @@
allow vendor_biometricsface tee_device:chr_file rw_file_perms;
# Access for DSP/QDSP device
-allow vendor_biometricsface qdsp_device:chr_file rw_file_perms;
-allow vendor_biometricsface dsp_device:chr_file rw_file_perms;
+allow vendor_biometricsface vendor_qdsp_device:chr_file rw_file_perms;
+allow vendor_biometricsface vendor_dsp_device:chr_file rw_file_perms;
# Access for sdcard
userdebug_or_eng('
@@ -58,7 +58,7 @@
allow vendor_biometricsface vendor_biometricsface_data_file:file create_file_perms;
# Allow to read persist.biometrics.face3d.producer,adsprpc prop
-get_prop(vendor_biometricsface, face3d_producer_prop);
+get_prop(vendor_biometricsface, vendor_face3d_producer_prop);
get_prop(vendor_biometricsface, vendor_adsprpc_prop);
allow vendor_biometricsface fwk_camera_hwservice:hwservice_manager find;
diff --git a/qva/vendor/kona/property.te b/qva/vendor/kona/property.te
index b370421..69ce3dc 100644
--- a/qva/vendor/kona/property.te
+++ b/qva/vendor/kona/property.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#face3d
-type face3d_producer_prop, property_type;
+type vendor_face3d_producer_prop, property_type;
diff --git a/qva/vendor/kona/property_contexts b/qva/vendor/kona/property_contexts
index 1974074..99d6bb3 100644
--- a/qva/vendor/kona/property_contexts
+++ b/qva/vendor/kona/property_contexts
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#face3d
-persist.vendor.biometricsface.pr u:object_r:face3d_producer_prop:s0
+persist.vendor.biometricsface.pr u:object_r:vendor_face3d_producer_prop:s0
diff --git a/qva/vendor/msmnile/file_contexts b/qva/vendor/msmnile/file_contexts
index 81a4fe6..c14aa03 100644
--- a/qva/vendor/msmnile/file_contexts
+++ b/qva/vendor/msmnile/file_contexts
@@ -29,8 +29,8 @@
#
/dev/spidev2.0 u:object_r:audio_device:s0
-/(vendor|system/vendor)/bin/hw/vendor.qti.hardware.automotive.vehicle@1.0-service u:object_r:hal_automotive_vehicle_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor.qti.hardware.automotive.vehicle@1.0-service u:object_r:vendor_hal_automotive_vehicle_qti_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor.qti.hardware.automotive.audiocontrol@1.0-service u:object_r:hal_audiocontrol_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor.qti.hardware.automotive.audiocontrol@1.0-service u:object_r:vendor_hal_audiocontrol_qti_exec:s0
# WLAN dynamic detect
-/(vendor|system/vendor)/bin/init\.qcom\.wlan\.sh u:object_r:init-qcom-wifi-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qcom\.wlan\.sh u:object_r:vendor_init-qcom-wifi-sh_exec:s0
diff --git a/qva/vendor/msmnile/genfs_contexts b/qva/vendor/msmnile/genfs_contexts
index 43f0dec..9573de9 100644
--- a/qva/vendor/msmnile/genfs_contexts
+++ b/qva/vendor/msmnile/genfs_contexts
@@ -28,4 +28,4 @@
genfscon sysfs /devices/platform/soc/18800000.qcom,icnss/net u:object_r:sysfs_net:s0
# spdaemon sysfs
-genfscon sysfs /devices/platform/soc/soc:qcom,spss_utils/firmware_name u:object_r:sysfs_spdaemon:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,spss_utils/firmware_name u:object_r:vendor_sysfs_spdaemon:s0
diff --git a/qva/vendor/msmnile/hal_audiocontrol_qti.te b/qva/vendor/msmnile/hal_audiocontrol_qti.te
index 363c716..7293e46 100644
--- a/qva/vendor/msmnile/hal_audiocontrol_qti.te
+++ b/qva/vendor/msmnile/hal_audiocontrol_qti.te
@@ -25,8 +25,8 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_audiocontrol_qti, domain;
-hal_server_domain(hal_audiocontrol_qti, hal_audiocontrol)
+type vendor_hal_audiocontrol_qti, domain;
+hal_server_domain(vendor_hal_audiocontrol_qti, hal_audiocontrol)
-type hal_audiocontrol_qti_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_audiocontrol_qti)
+type vendor_hal_audiocontrol_qti_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_audiocontrol_qti)
diff --git a/qva/vendor/msmnile/hal_automotive_vehicle_qti.te b/qva/vendor/msmnile/hal_automotive_vehicle_qti.te
index 683a2fa..0d263df 100644
--- a/qva/vendor/msmnile/hal_automotive_vehicle_qti.te
+++ b/qva/vendor/msmnile/hal_automotive_vehicle_qti.te
@@ -25,12 +25,12 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_automotive_vehicle_qti, domain;
+type vendor_hal_automotive_vehicle_qti, domain;
-type hal_automotive_vehicle_qti_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(hal_automotive_vehicle_qti)
+type vendor_hal_automotive_vehicle_qti_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(vendor_hal_automotive_vehicle_qti)
-hal_server_domain(hal_automotive_vehicle_qti, hal_vehicle);
+hal_server_domain(vendor_hal_automotive_vehicle_qti, hal_vehicle);
-allow hal_automotive_vehicle_qti self:can_socket create_socket_perms;
-allowxperm hal_automotive_vehicle_qti self:can_socket ioctl { unpriv_sock_ioctls priv_sock_ioctls };
+allow vendor_hal_automotive_vehicle_qti self:can_socket create_socket_perms;
+allowxperm vendor_hal_automotive_vehicle_qti self:can_socket ioctl { unpriv_sock_ioctls priv_sock_ioctls };
diff --git a/qva/vendor/msmnile/init-qcom-wifi-sh.te b/qva/vendor/msmnile/init-qcom-wifi-sh.te
index 5a0de23..d210198 100644
--- a/qva/vendor/msmnile/init-qcom-wifi-sh.te
+++ b/qva/vendor/msmnile/init-qcom-wifi-sh.te
@@ -25,14 +25,14 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qcom-wifi-sh, domain;
-type init-qcom-wifi-sh_exec, exec_type, vendor_file_type, file_type;
+type vendor_init-qcom-wifi-sh, domain;
+type vendor_init-qcom-wifi-sh_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(init-qcom-wifi-sh)
+init_daemon_domain(vendor_init-qcom-wifi-sh)
# WLAN dynamic detect
# - allow exec lspci: access /sys/bus/pci/devices & /sys/devices/platform/soc
# - set wlan prop
-allow init-qcom-wifi-sh vendor_toolbox_exec:file rx_file_perms;
-r_dir_file(init-qcom-wifi-sh, sysfs_type)
-set_prop(init-qcom-wifi-sh, qcom_wlan_prop);
+allow vendor_init-qcom-wifi-sh vendor_toolbox_exec:file rx_file_perms;
+r_dir_file(vendor_init-qcom-wifi-sh, sysfs_type)
+set_prop(vendor_init-qcom-wifi-sh, vendor_qcom_wlan_prop);
diff --git a/qva/vendor/msmnile/property.te b/qva/vendor/msmnile/property.te
index f3cab48..bc718a4 100644
--- a/qva/vendor/msmnile/property.te
+++ b/qva/vendor/msmnile/property.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# WLAN dynamic detect
-type qcom_wlan_prop, property_type;
+type vendor_qcom_wlan_prop, property_type;
diff --git a/qva/vendor/msmnile/property_contexts b/qva/vendor/msmnile/property_contexts
index 543f3b1..36f627a 100644
--- a/qva/vendor/msmnile/property_contexts
+++ b/qva/vendor/msmnile/property_contexts
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# WLAN dynamic detect
-ro.vendor.wlan.chip u:object_r:qcom_wlan_prop:s0
+ro.vendor.wlan.chip u:object_r:vendor_qcom_wlan_prop:s0
diff --git a/qva/vendor/msmnile/vendor_init.te b/qva/vendor/msmnile/vendor_init.te
index a854887..99e1d75 100644
--- a/qva/vendor/msmnile/vendor_init.te
+++ b/qva/vendor/msmnile/vendor_init.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# WLAN dynamic detect
-get_prop(vendor_init, qcom_wlan_prop)
+get_prop(vendor_init, vendor_qcom_wlan_prop)
diff --git a/qva/vendor/msmsteppe/device.te b/qva/vendor/msmsteppe/device.te
index dcf6538..28e7e54 100644
--- a/qva/vendor/msmsteppe/device.te
+++ b/qva/vendor/msmsteppe/device.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#logdump partition
-type logdump_partition, dev_type;
-type mba_debug_dev, dev_type;
-type dip_device, dev_type;
-type rawdump_block_device, dev_type;
+type vendor_logdump_partition, dev_type;
+type vendor_mba_debug_dev, dev_type;
+type vendor_dip_device, dev_type;
+type vendor_rawdump_block_device, dev_type;
diff --git a/qva/vendor/msmsteppe/file.te b/qva/vendor/msmsteppe/file.te
index 2d56f78..4e2b1fd 100644
--- a/qva/vendor/msmsteppe/file.te
+++ b/qva/vendor/msmsteppe/file.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sysfs_fps_attr, fs_type, sysfs_type;
+type vendor_sysfs_fps_attr, fs_type, sysfs_type;
diff --git a/qva/vendor/msmsteppe/file_contexts b/qva/vendor/msmsteppe/file_contexts
index 58952c3..c8c01f2 100644
--- a/qva/vendor/msmsteppe/file_contexts
+++ b/qva/vendor/msmsteppe/file_contexts
@@ -28,7 +28,7 @@
# Dev block nodes
#Primary storage device nodes
-/dev/block/mmcblk0rpmb u:object_r:rpmb_device:s0
+/dev/block/mmcblk0rpmb u:object_r:vendor_rpmb_device:s0
/dev/block/mmcblk0 u:object_r:root_block_device:s0
# UFS Devices
@@ -36,62 +36,62 @@
/dev/block/platform/soc/1d84000.ufshc/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dip u:object_r:vendor_dip_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/super u:object_r:super_block_device:s0
#rawdump partition
-/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# A/B partitions.
-/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:persist_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
-/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/1d84000.ufshc/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/1d84000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
##################################
# non-hlos mount points
@@ -99,66 +99,66 @@
/bt_firmware u:object_r:bt_firmware_file:s0
#for eMMC
-/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/vendor_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/storsec_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/recovery_[ab] u:object_r:recovery_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta_system_[ab] u:object_r:vendor_custom_ab_block_device:s0
#non A/B
/dev/block/platform/soc/7c4000.sdhci/by-name/system u:object_r:system_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/dip u:object_r:vendor_dip_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/storsec u:object_r:boot_block_device:s0
-/dev/block/platform/soc/7c4000.sdhci/by-name/persist u:object_r:persist_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/persist u:object_r:vendor_persist_block_device:s0
/dev/block/platform/soc/7c4000.sdhci/by-name/super u:object_r:super_block_device:s0
#rawdump partition
-/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:init-qti-fbe-sh_exec:s0
-/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:vendor_init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:vendor_qti_init_shell_exec:s0
##################################
# same process HAL libs
@@ -166,7 +166,7 @@
/vendor/lib(64)?/hw/vulkan\.sm6150\.so u:object_r:same_process_hal_file:s0
#FPC
-/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:sysfs_fps_attr:s0
-/sys/devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-03/200f000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/modalias u:object_r:sysfs_fps_attr:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-fpc u:object_r:hal_fingerprint_fpc_exec:s0
+/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:vendor_sysfs_fps_attr:s0
+/sys/devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-03/200f000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/modalias u:object_r:vendor_sysfs_fps_attr:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-fpc u:object_r:vendor_hal_fingerprint_fpc_exec:s0
diff --git a/qva/vendor/msmsteppe/fingerprintd.te b/qva/vendor/msmsteppe/fingerprintd.te
index 0655361..678d00c 100644
--- a/qva/vendor/msmsteppe/fingerprintd.te
+++ b/qva/vendor/msmsteppe/fingerprintd.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
allow hal_fingerprint input_device:dir r_dir_perms;
-allow hal_fingerprint sysfs_fps_attr:file rw_file_perms;
+allow hal_fingerprint vendor_sysfs_fps_attr:file rw_file_perms;
allow hal_fingerprint uhid_device:chr_file rw_file_perms;
r_dir_file(hal_fingerprint, firmware_file);
r_dir_file(hal_fingerprint, sysfs_leds);
diff --git a/qva/vendor/msmsteppe/genfs_contexts b/qva/vendor/msmsteppe/genfs_contexts
index f8a2689..c971ad6 100755
--- a/qva/vendor/msmsteppe/genfs_contexts
+++ b/qva/vendor/msmsteppe/genfs_contexts
@@ -27,74 +27,74 @@
###################################
#pmic sysfs_nodes
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/dc u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/main u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/pc_port u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/usb u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:sysfs_usbpd_device:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qpnp,qg/power_supply/bms u:object_r:sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/dc u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,usb-pdphy@1700/usbpd/usbpd0 u:object_r:vendor_sysfs_usbpd_device:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qpnp,qg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:qcom,pm6150_rtc/rtc u:object_r:sysfs_rtc:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0008/88c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-000c/88c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /class/qcom-battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /class/charge_pump u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-000c/a8c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0008/a8c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0010/a8c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0008/88c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-000c/88c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /class/qcom-battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /class/charge_pump u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-000c/a8c000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0008/a8c000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/a8c000.i2c/i2c-2/2-0010/a8c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-2/2-0010/88c000.i2c:qcom,smb1390@10:qcom,charge_pump/power_supply/charge_pump_master u:object_r:vendor_sysfs_battery_supply:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-01/c440000.qcom,spmi:qcom,pm6150@1:qcom,vibrator@5300/leds/vibrator u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/red u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/green u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/blue u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/red u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/green u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d000/leds/blue u:object_r:vendor_sysfs_graphics:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d300/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,wled@d800/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,wled@d800/backlight u:object_r:sysfs_leds:s0
# subsys SSR entries
-genfscon sysfs /devices/platform/soc/62400000.qcom,lpass/subsys0/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/62400000.qcom,lpass/subsys0/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:vendor_sysfs_ssr:s0
#diffrent target using same apps combo
-genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys5/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys6/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys5/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys6/name u:object_r:vendor_sysfs_ssr:s0
#entry for usb controller
-genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:sysfs_usb_controller:s0
+genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/udc/a600000.dwc3 u:object_r:vendor_sysfs_usb_controller:s0
#qdss sysfs-node
-genfscon sysfs /devices/platform/soc/6047000.tmc/coresight-tmc-etf u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/91866f0.hwevent/coresight-hwevent u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/6b0e000.csr/coresight-swao-csr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-llcc-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-llcc-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/6047000.tmc/coresight-tmc-etf u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6048000.tmc/coresight-tmc-etr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6002000.stm/coresight-stm u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/91866f0.hwevent/coresight-hwevent u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/6b0e000.csr/coresight-swao-csr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-llcc-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-llcc-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-llcc-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-llcc-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu6-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cdsp-cdsp-l3-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,npu-npu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
#fps sysfs-node
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/sde-crtc-2/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
#subsys nodes
genfscon sysfs /devices/platform/soc/soc:bt_qca6174/extldo u:object_r:sysfs_bluetooth_writable:s0
genfscon sysfs /devices/platform/soc/soc:bt_qca6174/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0
diff --git a/qva/vendor/msmsteppe/hal_fingerprint_fpc.te b/qva/vendor/msmsteppe/hal_fingerprint_fpc.te
index 967319e..5076262 100644
--- a/qva/vendor/msmsteppe/hal_fingerprint_fpc.te
+++ b/qva/vendor/msmsteppe/hal_fingerprint_fpc.te
@@ -25,11 +25,11 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_fingerprint_fpc, domain;
-hal_server_domain(hal_fingerprint_fpc, hal_fingerprint)
+type vendor_hal_fingerprint_fpc, domain;
+hal_server_domain(vendor_hal_fingerprint_fpc, hal_fingerprint)
-type hal_fingerprint_fpc_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_fingerprint_fpc)
+type vendor_hal_fingerprint_fpc_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_fingerprint_fpc)
-allow hal_fingerprint_fpc input_device:chr_file r_file_perms;
-allow hal_fingerprint_fpc tee_device:chr_file rw_file_perms;
+allow vendor_hal_fingerprint_fpc input_device:chr_file r_file_perms;
+allow vendor_hal_fingerprint_fpc tee_device:chr_file rw_file_perms;
diff --git a/qva/vendor/msmsteppe/hal_sensors.te b/qva/vendor/msmsteppe/hal_sensors.te
index 6b54cd4..e44c926 100644
--- a/qva/vendor/msmsteppe/hal_sensors.te
+++ b/qva/vendor/msmsteppe/hal_sensors.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_sensors hal_fingerprint_fpc:unix_stream_socket { connectto };
+allow hal_sensors vendor_hal_fingerprint_fpc:unix_stream_socket { connectto };
diff --git a/qva/vendor/msmsteppe/init-qti-fbe-sh.te b/qva/vendor/msmsteppe/init-qti-fbe-sh.te
index a1cc3bd..ee17f17 100644
--- a/qva/vendor/msmsteppe/init-qti-fbe-sh.te
+++ b/qva/vendor/msmsteppe/init-qti-fbe-sh.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qti-fbe-sh, domain;
-type init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
+type vendor_init-qti-fbe-sh, domain;
+type vendor_init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(init-qti-fbe-sh)
+init_daemon_domain(vendor_init-qti-fbe-sh)
-allow init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
# execute toybox/toolbox
-allow init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
-get_prop(init-qti-fbe-sh, vendor_tee_listener_prop)
+allow vendor_init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
+get_prop(vendor_init-qti-fbe-sh, vendor_tee_listener_prop)
diff --git a/qva/vendor/msmsteppe/init_shell.te b/qva/vendor/msmsteppe/init_shell.te
index d48c372..6359723 100644
--- a/qva/vendor/msmsteppe/init_shell.te
+++ b/qva/vendor/msmsteppe/init_shell.te
@@ -27,7 +27,7 @@
# media_sm6150_version_prop - to choose target version specific media_codecs.xml
# media_sdmmagpie_version_prop - to choose target version specific media_codecs.xml
-allow qti_init_shell {
+allow vendor_qti_init_shell {
vendor_media_sm6150_version_prop
vendor_media_sdmmagpie_version_prop
vendor_chre_enabled_prop
diff --git a/qva/vendor/msmsteppe/recovery.te b/qva/vendor/msmsteppe/recovery.te
index 62dabc6..616d011 100644
--- a/qva/vendor/msmsteppe/recovery.te
+++ b/qva/vendor/msmsteppe/recovery.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
recovery_only(`
- domain_auto_trans(recovery, qrtr_exec, qrtr)
+ domain_auto_trans(recovery, vendor_qrtr_exec, vendor_qrtr)
domain_auto_trans(recovery, rfs_access_exec, rfs_access)
domain_auto_trans(recovery, rmt_storage_exec, rmt_storage)
')
diff --git a/qva/vendor/msmsteppe/update_engine_common.te b/qva/vendor/msmsteppe/update_engine_common.te
index c7198ac..607ee8c 100644
--- a/qva/vendor/msmsteppe/update_engine_common.te
+++ b/qva/vendor/msmsteppe/update_engine_common.te
@@ -28,11 +28,11 @@
# Allow update_engine and update_engine_sideload (recovery) read/write on the
# device-specific partitions it should update.
allow update_engine_common {
- custom_ab_block_device
- xbl_block_device
- uefi_block_device
- ssd_block_device
- modem_block_device
+ vendor_custom_ab_block_device
+ vendor_xbl_block_device
+ vendor_uefi_block_device
+ vendor_ssd_block_device
+ vendor_modem_block_device
recovery_block_device
}:blk_file rw_file_perms;
allow update_engine_common tmpfs:lnk_file r_file_perms;
diff --git a/qva/vendor/ssg/seapp_contexts b/qva/vendor/ssg/seapp_contexts
index dc38848..145838a 100644
--- a/qva/vendor/ssg/seapp_contexts
+++ b/qva/vendor/ssg/seapp_contexts
@@ -1,4 +1,4 @@
# SSG apps for Connection Security
-user=_app seinfo=ssgapp domain=ssg_app name=com.qualcomm.qti.qms.service.connectionsecurity type=app_data_file levelFrom=all
-user=_app seinfo=ssgapp domain=ssg_app name=com.qualcomm.qti.qms.service.telemetry type=app_data_file levelFrom=all
-user=_app seinfo=ssgapp domain=ssg_app name=com.qualcomm.qti.qms.service.trustzoneaccess type=app_data_file levelFrom=all
+user=_app seinfo=ssgapp domain=vendor_ssg_app name=com.qualcomm.qti.qms.service.connectionsecurity type=app_data_file levelFrom=all
+user=_app seinfo=ssgapp domain=vendor_ssg_app name=com.qualcomm.qti.qms.service.telemetry type=app_data_file levelFrom=all
+user=_app seinfo=ssgapp domain=vendor_ssg_app name=com.qualcomm.qti.qms.service.trustzoneaccess type=app_data_file levelFrom=all
diff --git a/qva/vendor/ssg/ssg_app.te b/qva/vendor/ssg/ssg_app.te
index b835d7a..342a3b8 100644
--- a/qva/vendor/ssg/ssg_app.te
+++ b/qva/vendor/ssg/ssg_app.te
@@ -25,37 +25,37 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-## ssg_app
+## vendor_ssg_app
##
-## This file defines the permissions that ssg_apps can carry
+## This file defines the permissions that vendor_ssg_apps can carry
-type ssg_app, domain;
+type vendor_ssg_app, domain;
-app_domain(ssg_app)
-net_domain(ssg_app)
+app_domain(vendor_ssg_app)
+net_domain(vendor_ssg_app)
# Allow access to sockets
-unix_socket_connect(ssg_app, mlid, mlid)
-unix_socket_connect(ssg_app, ssgqmig, ssgqmigd)
-unix_socket_connect(ssg_app, ssgtzd, ssgtzd)
+unix_socket_connect(vendor_ssg_app, vendor_mlid, vendor_mlid)
+unix_socket_connect(vendor_ssg_app, vendor_ssgqmig, vendor_ssgqmigd)
+unix_socket_connect(vendor_ssg_app, vendor_ssgtzd, vendor_ssgtzd)
#access to qdma socket
-qdma_file_socket(ssg_app)
+qdma_file_socket(vendor_ssg_app)
-allow ssg_app radio_service:service_manager find;
-allow ssg_app surfaceflinger_service:service_manager find;
-allow ssg_app app_api_service:service_manager find;
+allow vendor_ssg_app radio_service:service_manager find;
+allow vendor_ssg_app surfaceflinger_service:service_manager find;
+allow vendor_ssg_app app_api_service:service_manager find;
# access to qipcrtr socket (allow creating needed by qmi_cci_xprt_qrtr_supported)
-allow ssg_app self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow vendor_ssg_app self:qipcrtr_socket create_socket_perms_no_ioctl;
# To get uuid and device info
-allow ssg_app proc_cpuinfo:file r_file_perms;
-allow ssg_app proc_meminfo:file r_file_perms;
+allow vendor_ssg_app proc_cpuinfo:file r_file_perms;
+allow vendor_ssg_app proc_meminfo:file r_file_perms;
-unix_socket_connect(ssg_app,dpmtcm, dpmd);
+unix_socket_connect(vendor_ssg_app,dpmtcm, dpmd);
-r_dir_file(ssg_app, proc)
+r_dir_file(vendor_ssg_app, proc)
# Fix the permission error for lib resource link.
-allow ssg_app app_data_file:lnk_file read;
+allow vendor_ssg_app app_data_file:lnk_file read;
diff --git a/qva/vendor/test/attributes b/qva/vendor/test/attributes
index a4332f8..880e363 100644
--- a/qva/vendor/test/attributes
+++ b/qva/vendor/test/attributes
@@ -26,6 +26,6 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-attribute qtiloopback;
-attribute qtiloopback_server;
-attribute qtiloopback_client;
+attribute vendor_qtiloopback;
+attribute vendor_qtiloopback_server;
+attribute vendor_qtiloopback_client;
diff --git a/qva/vendor/test/dumpstate.te b/qva/vendor/test/dumpstate.te
index 94a705d..d75bc70 100644
--- a/qva/vendor/test/dumpstate.te
+++ b/qva/vendor/test/dumpstate.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow dumpstate binder_state:file r_file_perms;
+allow dumpstate vendor_binder_state:file r_file_perms;
diff --git a/qva/vendor/test/file.te b/qva/vendor/test/file.te
index 72e4562..09484a2 100644
--- a/qva/vendor/test/file.te
+++ b/qva/vendor/test/file.te
@@ -26,4 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# /sys/kernel/debug/binder/state file
-type binder_state, file_type, debugfs_type;
+type vendor_binder_state, file_type, debugfs_type;
diff --git a/qva/vendor/test/file_contexts b/qva/vendor/test/file_contexts
index 4160940..da4c86f 100644
--- a/qva/vendor/test/file_contexts
+++ b/qva/vendor/test/file_contexts
@@ -26,5 +26,5 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# for system_server to access /sys/kernel/debug/binder/state
-/sys/kernel/debug/binder/state u:object_r:binder_state:s0
-/vendor/bin/Loopback_native u:object_r:qtiloopback_native_exec:s0
+/sys/kernel/debug/binder/state u:object_r:vendor_binder_state:s0
+/vendor/bin/Loopback_native u:object_r:vendor_qtiloopback_native_exec:s0
diff --git a/qva/vendor/test/hwservice.te b/qva/vendor/test/hwservice.te
index 94d5354..78c1df6 100644
--- a/qva/vendor/test/hwservice.te
+++ b/qva/vendor/test/hwservice.te
@@ -26,4 +26,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qtiloopback_hwservice , hwservice_manager_type, protected_hwservice;
+type vendor_qtiloopback_hwservice , hwservice_manager_type;
diff --git a/qva/vendor/test/hwservice_contexts b/qva/vendor/test/hwservice_contexts
index 5080691..dc0544e 100644
--- a/qva/vendor/test/hwservice_contexts
+++ b/qva/vendor/test/hwservice_contexts
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-com.qualcomm.qti.loopbackhal::Iloopback u:object_r:qtiloopback_hwservice:s0
+com.qualcomm.qti.loopbackhal::Iloopback u:object_r:vendor_qtiloopback_hwservice:s0
diff --git a/qva/vendor/test/init.te b/qva/vendor/test/init.te
index 8c3ff0b..ac13c43 100644
--- a/qva/vendor/test/init.te
+++ b/qva/vendor/test/init.te
@@ -25,5 +25,5 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow init binder_state:file r_file_perms;
+allow init vendor_binder_state:file r_file_perms;
diff --git a/qva/vendor/test/location_app_test.te b/qva/vendor/test/location_app_test.te
index bbb9ac8..a81362b 100644
--- a/qva/vendor/test/location_app_test.te
+++ b/qva/vendor/test/location_app_test.te
@@ -28,28 +28,28 @@
# qva/private/location_app_test.te - sepolicy rules for qti value added
# location apps (internal) that will be part of system image. eg: ODLT, Qlogcat
-type location_app_test, domain;
-app_domain(location_app_test)
+type vendor_location_app_test, domain;
+app_domain(vendor_location_app_test)
userdebug_or_eng(`
- binder_use(location_app_test)
- # allow location_app_test to access perf hal
- hal_client_domain(location_app_test, hal_perf)
- hal_client_domain(location_app_test, hal_gnss)
+ binder_use(vendor_location_app_test)
+ # allow vendor_location_app_test to access perf hal
+ hal_client_domain(vendor_location_app_test, vendor_hal_perf)
+ hal_client_domain(vendor_location_app_test, hal_gnss)
- allow location_app_test { adbd su }:unix_stream_socket connectto;
+ allow vendor_location_app_test { adbd su }:unix_stream_socket connectto;
- allow location_app_test app_api_service:service_manager find;
- allow location_app_test mediametrics_service:service_manager find;
+ allow vendor_location_app_test app_api_service:service_manager find;
+ allow vendor_location_app_test mediametrics_service:service_manager find;
- allow location_app_test cgroup:file rw_file_perms;
+ allow vendor_location_app_test cgroup:file rw_file_perms;
- allow location_app_test anr_data_file:dir rw_dir_perms;
- allow location_app_test anr_data_file:file rw_file_perms;
+ allow vendor_location_app_test anr_data_file:dir rw_dir_perms;
+ allow vendor_location_app_test anr_data_file:file rw_file_perms;
- unix_socket_send(location_app_test, seempdw, seempd);
+ unix_socket_send(vendor_location_app_test, seempdw, seempd);
#loc api access from ODLT
- allow location_app_test self:qipcrtr_socket create_socket_perms_no_ioctl;
+ allow vendor_location_app_test self:qipcrtr_socket create_socket_perms_no_ioctl;
- allow location_app_test audioserver_service:service_manager find;
+ allow vendor_location_app_test audioserver_service:service_manager find;
')
diff --git a/qva/vendor/test/qdmautils_app.te b/qva/vendor/test/qdmautils_app.te
index f5e59d8..2592ea2 100644
--- a/qva/vendor/test/qdmautils_app.te
+++ b/qva/vendor/test/qdmautils_app.te
@@ -25,35 +25,35 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qdmautils_app, domain, mlstrustedsubject;
-app_domain(qdmautils_app)
-net_domain(qdmautils_app)
-binder_use(qdmautils_app)
+type vendor_qdmautils_app, domain, mlstrustedsubject;
+app_domain(vendor_qdmautils_app)
+net_domain(vendor_qdmautils_app)
+binder_use(vendor_qdmautils_app)
# allow invoking activity and access app content
-allow qdmautils_app { activity_service content_service }:service_manager find;
+allow vendor_qdmautils_app { activity_service content_service }:service_manager find;
# allow display servicepp
-allow qdmautils_app { display_service }:service_manager find;
+allow vendor_qdmautils_app { display_service }:service_manager find;
# allow access to wifi and data network
-allow qdmautils_app { connectivity_service network_management_service }:service_manager find;
+allow vendor_qdmautils_app { connectivity_service network_management_service }:service_manager find;
# allow access telephony service info
-allow qdmautils_app { radio_service registry_service }:service_manager find;
+allow vendor_qdmautils_app { radio_service registry_service }:service_manager find;
# for vendor_perf_service
-allow qdmautils_app app_api_service:service_manager find;
+allow vendor_qdmautils_app app_api_service:service_manager find;
-# allow qdmautils_app to access system_app_data_file
+# allow vendor_qdmautils_app to access system_app_data_file
# necessary for read and write /data/data subdirectory
-allow qdmautils_app system_app_data_file:dir create_dir_perms;
-allow qdmautils_app system_app_data_file:file create_file_perms;
-allow qdmautils_app surfaceflinger_service:service_manager find;
+allow vendor_qdmautils_app system_app_data_file:dir create_dir_perms;
+allow vendor_qdmautils_app system_app_data_file:file create_file_perms;
+allow vendor_qdmautils_app surfaceflinger_service:service_manager find;
# allow access to qdma dropbox
-allow qdmautils_app vendor_qdma_data_file:dir create_dir_perms;
-allow qdmautils_app vendor_qdma_data_file:file create_file_perms;
+allow vendor_qdmautils_app vendor_qdma_data_file:dir create_dir_perms;
+allow vendor_qdmautils_app vendor_qdma_data_file:file create_file_perms;
# for aws iot mqtt
-allow qdmautils_app self:{ socket udp_socket } create_socket_perms_no_ioctl;
+allow vendor_qdmautils_app self:{ socket udp_socket } create_socket_perms_no_ioctl;
# allow qdma_prop
-set_prop(qdmautils_app, vendor_qdma_prop);
+set_prop(vendor_qdmautils_app, vendor_qdma_prop);
diff --git a/qva/vendor/test/qtiloopback_app.te b/qva/vendor/test/qtiloopback_app.te
index 1bc5ff3..33cf302 100644
--- a/qva/vendor/test/qtiloopback_app.te
+++ b/qva/vendor/test/qtiloopback_app.te
@@ -25,14 +25,14 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qtiloopback_app, domain;
-app_domain(qtiloopback_app)
+type vendor_qtiloopback_app, domain;
+app_domain(vendor_qtiloopback_app)
userdebug_or_eng(`
-hal_client_domain(qtiloopback_app,qtiloopback)
+hal_client_domain(vendor_qtiloopback_app,vendor_qtiloopback)
-allow qtiloopback_app activity_service:service_manager find;
-allow qtiloopback_app cgroup:file rw_file_perms;
-allow qtiloopback_app system_app_data_file:dir r_dir_perms;
-allow qtiloopback_app app_api_service:service_manager find;
+allow vendor_qtiloopback_app activity_service:service_manager find;
+allow vendor_qtiloopback_app cgroup:file rw_file_perms;
+allow vendor_qtiloopback_app system_app_data_file:dir r_dir_perms;
+allow vendor_qtiloopback_app app_api_service:service_manager find;
')
diff --git a/qva/vendor/test/qtiloopback_native.te b/qva/vendor/test/qtiloopback_native.te
index f903389..1ca6776 100644
--- a/qva/vendor/test/qtiloopback_native.te
+++ b/qva/vendor/test/qtiloopback_native.te
@@ -26,19 +26,19 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type qtiloopback_native, domain;
-type qtiloopback_native_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(qtiloopback_native)
-vndbinder_use(qtiloopback)
+type vendor_qtiloopback_native, domain;
+type vendor_qtiloopback_native_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_qtiloopback_native)
+vndbinder_use(vendor_qtiloopback)
userdebug_or_eng(`
-hal_server_domain_bypass(qtiloopback_native,qtiloopback)
-binder_call(qtiloopback_client,qtiloopback_server)
-binder_call(qtiloopback_server,qtiloopback_client)
-hal_attribute_hwservice(qtiloopback, qtiloopback_hwservice)
+hal_server_domain_bypass(vendor_qtiloopback_native,vendor_qtiloopback)
+binder_call(vendor_qtiloopback_client,vendor_qtiloopback_server)
+binder_call(vendor_qtiloopback_server,vendor_qtiloopback_client)
+hal_attribute_hwservice(vendor_qtiloopback, vendor_qtiloopback_hwservice)
-netmgr_socket(qtiloopback_native)
-allow qtiloopback_native self:{
+netmgr_socket(vendor_qtiloopback_native)
+allow vendor_qtiloopback_native self:{
# Allow receiving NETLINK responses from WLAN driver.
netlink_socket
netlink_generic_socket
@@ -46,9 +46,9 @@
netlink_route_socket
} create_socket_perms_no_ioctl;
-allow qtiloopback_native sysfs_diag:dir search;
-allow qtiloopback_native sysfs_timestamp_switch:file { open read };
-allow qtiloopback_native self:netlink_route_socket nlmsg_read;
-allow qtiloopback_native self:udp_socket { create ioctl };
+allow vendor_qtiloopback_native vendor_sysfs_diag:dir search;
+allow vendor_qtiloopback_native vendor_sysfs_timestamp_switch:file { open read };
+allow vendor_qtiloopback_native self:netlink_route_socket nlmsg_read;
+allow vendor_qtiloopback_native self:udp_socket { create ioctl };
')
diff --git a/qva/vendor/test/seapp_contexts b/qva/vendor/test/seapp_contexts
index 4aba4c4..4acfc9a 100644
--- a/qva/vendor/test/seapp_contexts
+++ b/qva/vendor/test/seapp_contexts
@@ -26,9 +26,9 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Add new domain for location test apps
-user=_app seinfo=platform name=com.qualcomm.qct.dlt levelfrom=all domain=location_app_test type=app_data_file
-user=_app seinfo=platform name=com.qualcomm.qti.qlogcat levelfrom=all domain=location_app_test type=app_data_file
-user=system seinfo=platform name=.loopbackservice domain=qtiloopback_app type=system_app_data_file
+user=_app seinfo=platform name=com.qualcomm.qct.dlt levelfrom=all domain=vendor_location_app_test type=app_data_file
+user=_app seinfo=platform name=com.qualcomm.qti.qlogcat levelfrom=all domain=vendor_location_app_test type=app_data_file
+user=system seinfo=platform name=.loopbackservice domain=vendor_qtiloopback_app type=system_app_data_file
#Add new domain for QDMAUtils
-user=system seinfo=platform name=com.qualcomm.qti.qdmautils domain=qdmautils_app type=system_app_data_file
+user=system seinfo=platform name=com.qualcomm.qti.qdmautils domain=vendor_qdmautils_app type=system_app_data_file
diff --git a/qva/vendor/test/system_server.te b/qva/vendor/test/system_server.te
index 8accae9..5718da2 100644
--- a/qva/vendor/test/system_server.te
+++ b/qva/vendor/test/system_server.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow system_server binder_state:file r_file_perms;
+allow system_server vendor_binder_state:file r_file_perms;
diff --git a/qva/vendor/test/vendor_init.te b/qva/vendor/test/vendor_init.te
index e92bb85..395c512 100644
--- a/qva/vendor/test/vendor_init.te
+++ b/qva/vendor/test/vendor_init.te
@@ -25,5 +25,5 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow vendor_init binder_state:file r_file_perms;
+allow vendor_init vendor_binder_state:file r_file_perms;
diff --git a/qva/vendor/trinket/device.te b/qva/vendor/trinket/device.te
index dcf6538..28e7e54 100644
--- a/qva/vendor/trinket/device.te
+++ b/qva/vendor/trinket/device.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#logdump partition
-type logdump_partition, dev_type;
-type mba_debug_dev, dev_type;
-type dip_device, dev_type;
-type rawdump_block_device, dev_type;
+type vendor_logdump_partition, dev_type;
+type vendor_mba_debug_dev, dev_type;
+type vendor_dip_device, dev_type;
+type vendor_rawdump_block_device, dev_type;
diff --git a/qva/vendor/trinket/file.te b/qva/vendor/trinket/file.te
index 2d56f78..4e2b1fd 100644
--- a/qva/vendor/trinket/file.te
+++ b/qva/vendor/trinket/file.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type sysfs_fps_attr, fs_type, sysfs_type;
+type vendor_sysfs_fps_attr, fs_type, sysfs_type;
diff --git a/qva/vendor/trinket/file_contexts b/qva/vendor/trinket/file_contexts
index ba2d44d..cf4d072 100644
--- a/qva/vendor/trinket/file_contexts
+++ b/qva/vendor/trinket/file_contexts
@@ -28,7 +28,7 @@
# Dev block nodes
#Primary storage device nodes
-/dev/block/mmcblk0rpmb u:object_r:rpmb_device:s0
+/dev/block/mmcblk0rpmb u:object_r:vendor_rpmb_device:s0
/dev/block/mmcblk0 u:object_r:root_block_device:s0
# UFS Devices
@@ -36,60 +36,60 @@
/dev/block/platform/soc/4804000.ufshc/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/4804000.ufshc/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/dip u:object_r:vendor_dip_device:s0
#rawdump partition
-/dev/block/platform/soc/4804000.ufshc/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# A/B partitions.
-/dev/block/platform/soc/4804000.ufshc/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/persist u:object_r:persist_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/persist u:object_r:vendor_persist_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4804000.ufshc/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
/dev/block/platform/soc/4804000.ufshc/by-name/super u:object_r:super_block_device:s0
# Block device holding the GPT, where the A/B attributes are stored.
-/dev/block/platform/soc/4804000.ufshc/sd[ade] u:object_r:gpt_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/sd[ade] u:object_r:vendor_gpt_block_device:s0
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
-/dev/block/platform/soc/4804000.ufshc/sd[bc] u:object_r:xbl_block_device:s0
+/dev/block/platform/soc/4804000.ufshc/sd[bc] u:object_r:vendor_xbl_block_device:s0
##################################
# non-hlos mount points
@@ -97,67 +97,67 @@
/bt_firmware u:object_r:bt_firmware_file:s0
#for eMMC
-/dev/block/platform/soc/4744000.sdhci/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/apdp_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/abl_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/apdp_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/boot_[ab] u:object_r:boot_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/cmnlib_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/cmnlib64_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/devcfg_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/hyp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/keymaster_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/modem_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/bluetooth_[ab] u:object_r:modem_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/msadp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/pmic_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/rpm_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/cmnlib_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/cmnlib64_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/devcfg_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/hyp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/keymaster_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/modem_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/bluetooth_[ab] u:object_r:vendor_modem_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/msadp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/pmic_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/rpm_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/system_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/tz_[ab] u:object_r:custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/tz_[ab] u:object_r:vendor_custom_ab_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/vendor_[ab] u:object_r:system_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/xbl_[ab] u:object_r:xbl_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/aop_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/dtbo_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/dsp_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/mdtp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:mdtp_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/qupfw_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/xbl_config_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/storsec_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/imagefv_[ab] u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/uefisecapp_[ab] u:object_r:uefi_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/xbl_[ab] u:object_r:vendor_xbl_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/aop_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/vbmeta_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/dtbo_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/dsp_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/mdtp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/mdtpsecapp_[ab] u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/qupfw_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/xbl_config_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/storsec_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/imagefv_[ab] u:object_r:vendor_custom_ab_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/uefisecapp_[ab] u:object_r:vendor_uefi_block_device:s0
#non A/B
/dev/block/platform/soc/4744000.sdhci/by-name/system u:object_r:system_block_device:s0
/dev/block/platform/soc/4744000.ufshc/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/boot u:object_r:boot_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/logdump u:object_r:logdump_partition:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/fsc u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/fsg u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/modemst1 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/modemst2 u:object_r:modem_efs_partition_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/logdump u:object_r:vendor_logdump_partition:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/fsc u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/fsg u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/modemst1 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/modemst2 u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/ssd u:object_r:vendor_ssd_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/misc u:object_r:misc_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/rpm u:object_r:rpmb_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/msadp u:object_r:mba_debug_dev:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/rpm u:object_r:vendor_rpmb_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/msadp u:object_r:vendor_mba_debug_dev:s0
/dev/block/platform/soc/4744000.sdhci/by-name/recovery u:object_r:recovery_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/cache u:object_r:cache_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/frp u:object_r:frp_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/mdtp u:object_r:mdtp_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/dip u:object_r:dip_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/mdtp u:object_r:vendor_mdtp_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/dip u:object_r:vendor_dip_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/storsec u:object_r:boot_block_device:s0
-/dev/block/platform/soc/4744000.sdhci/by-name/persist u:object_r:persist_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/persist u:object_r:vendor_persist_block_device:s0
/dev/block/platform/soc/4744000.sdhci/by-name/super u:object_r:super_block_device:s0
# Camera
-/sys/devices/platform/soc/5ca0000.qcom,jpeg/video4linux/video[0-33]/name(/.*)? u:object_r:sysfs_jpeg:s0
-/sys/devices/platform/soc/5c00000.qcom,msm-cam/video4linux/video[0-33]/name(/.*)? u:object_r:sysfs_jpeg:s0
+/sys/devices/platform/soc/5ca0000.qcom,jpeg/video4linux/video[0-33]/name(/.*)? u:object_r:vendor_sysfs_jpeg:s0
+/sys/devices/platform/soc/5c00000.qcom,msm-cam/video4linux/video[0-33]/name(/.*)? u:object_r:vendor_sysfs_jpeg:s0
#rawdump partition
-/dev/block/platform/soc/4744000.sdhci/by-name/rawdump u:object_r:rawdump_block_device:s0
+/dev/block/platform/soc/4744000.sdhci/by-name/rawdump u:object_r:vendor_rawdump_block_device:s0
# FBE
-/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:init-qti-fbe-sh_exec:s0
-/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:qti_init_shell_exec:s0
+/(vendor|system/vendor)/bin/init.qti.qseecomd.sh u:object_r:vendor_init-qti-fbe-sh_exec:s0
+/(vendor|system/vendor)/bin/init\.qti\.can\.sh u:object_r:vendor_qti_init_shell_exec:s0
##################################
# same process HAL libs
@@ -166,12 +166,12 @@
##################################
# Brightness permission
-/sys/devices/platform/soc/5e00000.qcom,mdss_mdp/backlight(/.*)? u:object_r:sysfs_graphics:s0
+/sys/devices/platform/soc/5e00000.qcom,mdss_mdp/backlight(/.*)? u:object_r:vendor_sysfs_graphics:s0
#FPC
-/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:sysfs_fps_attr:s0
-/sys/devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/leds/modalias u:object_r:sysfs_fps_attr:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-fpc u:object_r:hal_fingerprint_fpc_exec:s0
+/sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:vendor_sysfs_fps_attr:s0
+/sys/devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-03/c440000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/leds/modalias u:object_r:vendor_sysfs_fps_attr:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-fpc u:object_r:vendor_hal_fingerprint_fpc_exec:s0
-/sys/devices/platform/soc/1b46018.qfprom/qfprom0/nvmem u:object_r:sysfs_qfprom:s0
+/sys/devices/platform/soc/1b46018.qfprom/qfprom0/nvmem u:object_r:vendor_sysfs_qfprom:s0
diff --git a/qva/vendor/trinket/fingerprintd.te b/qva/vendor/trinket/fingerprintd.te
index 0655361..678d00c 100644
--- a/qva/vendor/trinket/fingerprintd.te
+++ b/qva/vendor/trinket/fingerprintd.te
@@ -26,7 +26,7 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
allow hal_fingerprint input_device:dir r_dir_perms;
-allow hal_fingerprint sysfs_fps_attr:file rw_file_perms;
+allow hal_fingerprint vendor_sysfs_fps_attr:file rw_file_perms;
allow hal_fingerprint uhid_device:chr_file rw_file_perms;
r_dir_file(hal_fingerprint, firmware_file);
r_dir_file(hal_fingerprint, sysfs_leds);
diff --git a/qva/vendor/trinket/genfs_contexts b/qva/vendor/trinket/genfs_contexts
index f9925d6..0a7722b 100644
--- a/qva/vendor/trinket/genfs_contexts
+++ b/qva/vendor/trinket/genfs_contexts
@@ -28,43 +28,43 @@
#pmic sysfs_nodes
genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,pm6125_rtc/rtc u:object_r:sysfs_rtc:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb u:object_r:sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/main u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-0008/4a84000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /class/qcom-battery u:object_r:sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/leds u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-0008/4a84000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /class/qcom-battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/leds u:object_r:vendor_sysfs_graphics:s0
genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,leds@d300/leds u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,vibrator@5700/leds/vibrator u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/soc/6080000.qcom,mss/subsys0/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/ab00000.qcom,lpass/subsys1/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/b300000.qcom,turing/subsys2/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/5ae0000.qcom,venus/subsys4/name u:object_r:sysfs_ssr:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/6080000.qcom,mss/subsys0/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/ab00000.qcom,lpass/subsys1/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/b300000.qcom,turing/subsys2/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/5ae0000.qcom,venus/subsys4/name u:object_r:vendor_sysfs_ssr:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys5/name u:object_r:vendor_sysfs_ssr:s0
#qdss sysfs-node
-genfscon sysfs /devices/platform/soc/8047000.tmc/coresight-tmc-etf u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/8048000.tmc/coresight-tmc-etr u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/8002000.stm/coresight-stm u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/4506604.hwevent/coresight-hwevent u:object_r:sysfs_qdss_dev:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-ddr-bw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/kgsl/kgsl-3d0/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,gpubw/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-busmon/devfreq u:object_r:sysfs_devfreq:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-lat/devfreq u:object_r:sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/8047000.tmc/coresight-tmc-etf u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/8048000.tmc/coresight-tmc-etr u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/8002000.stm/coresight-stm u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/4506604.hwevent/coresight-hwevent u:object_r:vendor_sysfs_qdss_dev:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu0-cpu-ddr-latfloor/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/kgsl/kgsl-3d0/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,gpubw/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-busmon/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
#fps sysfs-node
-genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/measured_fps u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
#net sysfs
genfscon sysfs /devices/platform/soc/c800000.qcom,icnss/net u:object_r:sysfs_net:s0
diff --git a/qva/vendor/trinket/hal_fingerprint_fpc.te b/qva/vendor/trinket/hal_fingerprint_fpc.te
index 967319e..5076262 100644
--- a/qva/vendor/trinket/hal_fingerprint_fpc.te
+++ b/qva/vendor/trinket/hal_fingerprint_fpc.te
@@ -25,11 +25,11 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type hal_fingerprint_fpc, domain;
-hal_server_domain(hal_fingerprint_fpc, hal_fingerprint)
+type vendor_hal_fingerprint_fpc, domain;
+hal_server_domain(vendor_hal_fingerprint_fpc, hal_fingerprint)
-type hal_fingerprint_fpc_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_fingerprint_fpc)
+type vendor_hal_fingerprint_fpc_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(vendor_hal_fingerprint_fpc)
-allow hal_fingerprint_fpc input_device:chr_file r_file_perms;
-allow hal_fingerprint_fpc tee_device:chr_file rw_file_perms;
+allow vendor_hal_fingerprint_fpc input_device:chr_file r_file_perms;
+allow vendor_hal_fingerprint_fpc tee_device:chr_file rw_file_perms;
diff --git a/qva/vendor/trinket/hal_sensors.te b/qva/vendor/trinket/hal_sensors.te
index 6b54cd4..e44c926 100644
--- a/qva/vendor/trinket/hal_sensors.te
+++ b/qva/vendor/trinket/hal_sensors.te
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-allow hal_sensors hal_fingerprint_fpc:unix_stream_socket { connectto };
+allow hal_sensors vendor_hal_fingerprint_fpc:unix_stream_socket { connectto };
diff --git a/qva/vendor/trinket/init-qti-fbe-sh.te b/qva/vendor/trinket/init-qti-fbe-sh.te
index a1cc3bd..ee17f17 100644
--- a/qva/vendor/trinket/init-qti-fbe-sh.te
+++ b/qva/vendor/trinket/init-qti-fbe-sh.te
@@ -25,13 +25,13 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-type init-qti-fbe-sh, domain;
-type init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
+type vendor_init-qti-fbe-sh, domain;
+type vendor_init-qti-fbe-sh_exec, exec_type, file_type, vendor_file_type;
-init_daemon_domain(init-qti-fbe-sh)
+init_daemon_domain(vendor_init-qti-fbe-sh)
-allow init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
+allow vendor_init-qti-fbe-sh vendor_shell_exec:file rx_file_perms;
# execute toybox/toolbox
-allow init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
-get_prop(init-qti-fbe-sh, vendor_tee_listener_prop)
+allow vendor_init-qti-fbe-sh vendor_toolbox_exec:file rx_file_perms;
+get_prop(vendor_init-qti-fbe-sh, vendor_tee_listener_prop)
diff --git a/qva/vendor/trinket/init_shell.te b/qva/vendor/trinket/init_shell.te
index 4d0295f..755a37d 100644
--- a/qva/vendor/trinket/init_shell.te
+++ b/qva/vendor/trinket/init_shell.te
@@ -25,6 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# media_trinket_version_prop - to choose target version specific media_codecs.xml
-allow qti_init_shell {
+allow vendor_qti_init_shell {
vendor_media_trinket_version_prop
}:property_service set;
diff --git a/qva/vendor/trinket/update_engine_common.te b/qva/vendor/trinket/update_engine_common.te
index 4cb01c0..629df5b 100644
--- a/qva/vendor/trinket/update_engine_common.te
+++ b/qva/vendor/trinket/update_engine_common.te
@@ -28,9 +28,9 @@
# Allow update_engine and update_engine_sideload (recovery) read/write on the
# device-specific partitions it should update.
allow update_engine_common {
- custom_ab_block_device
- xbl_block_device
- uefi_block_device
- ssd_block_device
- modem_block_device
+ vendor_custom_ab_block_device
+ vendor_xbl_block_device
+ vendor_uefi_block_device
+ vendor_ssd_block_device
+ vendor_modem_block_device
}:blk_file rw_file_perms;
diff --git a/timeservice/seapp_contexts b/timeservice/seapp_contexts
index 186c9fd..af78ed8 100644
--- a/timeservice/seapp_contexts
+++ b/timeservice/seapp_contexts
@@ -26,5 +26,5 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Needed for time service apk
-user=_app seinfo=timeserviceapp name=com.qualcomm.timeservice domain=timeservice_app type=app_data_file levelFrom=all
+user=_app seinfo=timeserviceapp name=com.qualcomm.timeservice domain=vendor_timeservice_app type=app_data_file levelFrom=all