Merge a8d0a3a4afd09b378fe936a89cc750fd2892452d on remote branch
Change-Id: Ia484fe61849bc4b47d62a4ae6371b63491f650f4
diff --git a/qva/vendor/common/hal_qccvndhalservice.te b/generic/vendor/common/hal_qccvndhalservice.te
similarity index 100%
rename from qva/vendor/common/hal_qccvndhalservice.te
rename to generic/vendor/common/hal_qccvndhalservice.te
diff --git a/generic/vendor/common/hwservice.te b/generic/vendor/common/hwservice.te
index 9404f98..859a351 100644
--- a/generic/vendor/common/hwservice.te
+++ b/generic/vendor/common/hwservice.te
@@ -44,3 +44,4 @@
type vendor_hal_camera_postproc_hwservice, hwservice_manager_type, protected_hwservice;
type vendor_hal_embmssl_hwservice, hwservice_manager_type, protected_hwservice;
type vendor_hal_dspmanager_hwservice, hwservice_manager_type;
+type vendor_hal_qccvndhal_hwservice , hwservice_manager_type, protected_hwservice;
diff --git a/generic/vendor/common/hwservice_contexts b/generic/vendor/common/hwservice_contexts
index 7d35ed9..22f3d67 100644
--- a/generic/vendor/common/hwservice_contexts
+++ b/generic/vendor/common/hwservice_contexts
@@ -64,3 +64,4 @@
vendor.qti.hardware.camera.postproc::IPostProcService u:object_r:vendor_hal_camera_postproc_hwservice:s0
vendor.qti.hardware.embmssl::IEmbms u:object_r:vendor_hal_embmssl_hwservice:s0
vendor.qti.hardware.dsp::IDspService u:object_r:vendor_hal_dspmanager_hwservice:s0
+vendor.qti.hardware.qccvndhal::IQccvndhal u:object_r:vendor_hal_qccvndhal_hwservice:s0
diff --git a/qva/private/file_contexts b/qva/private/file_contexts
index c51f183..e0cffa1 100644
--- a/qva/private/file_contexts
+++ b/qva/private/file_contexts
@@ -55,6 +55,7 @@
/(system_ext|system/system_ext)/bin/qdtservice u:object_r:vendor_qdtservice_exec:s0
/(system|system_ext|system/system_ext)/bin/sigma_miracasthalservice u:object_r:vendor_sigmahal_qti_exec:s0
/(system_ext|system/system_ext)/bin/qccsyshalservice u:object_r:vendor_qccsyshal_qti_exec:s0
+/(system_ext|system/system_ext)/bin/qccsyshal@[1-9]\.[1-9]-service u:object_r:vendor_qccsyshal_qti_exec:s0
/(system_ext|system/system_ext)/bin/mmi u:object_r:vendor_mmi_sys_exec:s0
/(system_ext|system/system_ext)/bin/mmi_diag u:object_r:vendor_mmi_sys_exec:s0
/(system_ext|system/system_ext)/bin/qspmsvc u:object_r:vendor_qspmsvc_exec:s0
diff --git a/qva/private/seapp_contexts b/qva/private/seapp_contexts
index 250c8a1..19d2ca0 100644
--- a/qva/private/seapp_contexts
+++ b/qva/private/seapp_contexts
@@ -31,7 +31,7 @@
user=_app seinfo=platform name=com.qualcomm.qti.ssmeditor domain=vendor_qconfig_app type=app_data_file levelfrom=all
#Add new domain for QCC
-user=system seinfo=platform name=com.qualcomm.qti.qdma isPrivApp=true domain=vendor_qcc_app type=system_app_data_file
+user=system seinfo=platform name=com.qti.qcc isPrivApp=true domain=vendor_qcc_app type=system_app_data_file
#Add new domain for QCCLMTP
user=system seinfo=platform name=com.qualcomm.qti.qcclmtp isPrivApp=true domain=vendor_qcc_lmtp_app type=system_app_data_file
#Add new domain for QCC-Utils
diff --git a/qva/vendor/common/hwservice.te b/qva/vendor/common/hwservice.te
index 0a4ba00..ae15b33 100644
--- a/qva/vendor/common/hwservice.te
+++ b/qva/vendor/common/hwservice.te
@@ -56,7 +56,6 @@
type vendor_hal_qspmhal_hwservice, hwservice_manager_type;
type vendor_hal_bluetooth_dun_hwservice, hwservice_manager_type, protected_hwservice;
type vendor_hal_qseecom_hwservice, hwservice_manager_type, protected_hwservice;
-type vendor_hal_qccvndhal_hwservice , hwservice_manager_type, protected_hwservice;
type vendor_hal_spu_hwservice, hwservice_manager_type, protected_hwservice;
type vendor_hal_slmadapter_hwservice, hwservice_manager_type, protected_hwservice;
type vendor_hal_perfcallback_hwservice, hwservice_manager_type, protected_hwservice;
diff --git a/qva/vendor/common/hwservice_contexts b/qva/vendor/common/hwservice_contexts
index 9c14cce..1a19886 100644
--- a/qva/vendor/common/hwservice_contexts
+++ b/qva/vendor/common/hwservice_contexts
@@ -70,7 +70,6 @@
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
vendor.qti.hardware.qseecom::IQSEECom u:object_r:vendor_hal_qseecom_hwservice:s0
-vendor.qti.hardware.qccvndhal::IQccvndhal u:object_r:vendor_hal_qccvndhal_hwservice:s0
vendor.qti.spu::ISPUManager u:object_r:vendor_hal_spu_hwservice:s0
vendor.qti.hardware.slmadapter::ISlmAdapter u:object_r:vendor_hal_slmadapter_hwservice:s0
vendor.qti.hardware.perf::IPerfCallback u:object_r:vendor_hal_perfcallback_hwservice:s0