Merge changes from topic "LA.UM.9.12.R1.11.00.00.597.108-merge" into sc-dev

* changes:
  Allow hal_rcsservice and qtelephony to get HAL services
  Add sepolicy rules for vendor.qti.qspmhal::IQspmhal
  Add sepolicy rules
  sepolicy change for ExtTelephonyService

10 files changed, 15 insertions, 0 deletions

diff --git a/vendor/qcom/common/cnd.te b/vendor/qcom/common/cnd.te
index a21d47b..de96b7b 100644
--- a/vendor/qcom/common/cnd.te
+++ b/vendor/qcom/common/cnd.te
@@ -50,3 +50,4 @@ binder_call(cnd, qtidataservices_app)
 get_prop(cnd, wifi_hal_prop)
 
 add_hwservice(cnd, hal_slmadapter_hwservice)
+add_hwservice(cnd, hal_mwqemadapter_hwservice)
diff --git a/vendor/qcom/common/hal_gnss_qti.te b/vendor/qcom/common/hal_gnss_qti.te
index cbafecf..d318661 100644
--- a/vendor/qcom/common/hal_gnss_qti.te
+++ b/vendor/qcom/common/hal_gnss_qti.te
@@ -19,3 +19,4 @@ allow hal_gnss_qti location_socket:sock_file create_file_perms;
 allow hal_gnss_qti vendor_per_mgr_service:service_manager find;
 
 allow hal_gnss_qti self:qipcrtr_socket create_socket_perms_no_ioctl;
+allow hal_gnss_qti location_data_file:dir r_dir_perms;
diff --git a/vendor/qcom/common/hal_rcsservice.te b/vendor/qcom/common/hal_rcsservice.te
index ff3038b..c825745 100644
--- a/vendor/qcom/common/hal_rcsservice.te
+++ b/vendor/qcom/common/hal_rcsservice.te
@@ -7,6 +7,8 @@ net_domain(hal_rcsservice)
 # To register imsrcsd to hwBinder
 hwbinder_use(hal_rcsservice)
 
+allow hal_rcsservice hidl_manager_hwservice:hwservice_manager find;
+
 # add IUceSerive and IService to Hidl interface
 add_hwservice(hal_rcsservice, hal_imsrcsd_hwservice)
 add_hwservice(hal_rcsservice, hal_imscallinfo_hwservice)
diff --git a/vendor/qcom/common/hwservice.te b/vendor/qcom/common/hwservice.te
index 531e4cf..08c0a76 100644
--- a/vendor/qcom/common/hwservice.te
+++ b/vendor/qcom/common/hwservice.te
@@ -18,3 +18,4 @@ type hal_imsfactory_hwservice, hwservice_manager_type, protected_hwservice, vend
 type hal_qspmhal_hwservice, hwservice_manager_type, vendor_hwservice_type;
 type hal_slmadapter_hwservice, hwservice_manager_type, protected_hwservice;
 type hal_dspmanager_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type hal_mwqemadapter_hwservice, hwservice_manager_type, protected_hwservice;
diff --git a/vendor/qcom/common/hwservice_contexts b/vendor/qcom/common/hwservice_contexts
index 4ecfdc9..8fb2887 100644
--- a/vendor/qcom/common/hwservice_contexts
+++ b/vendor/qcom/common/hwservice_contexts
@@ -33,3 +33,4 @@ vendor.qti.hardware.qseecom::IQSEECom                                   u:object
 vendor.qti.qspmhal::IQspmhal                                            u:object_r:hal_qspmhal_hwservice:s0
 vendor.qti.hardware.slmadapter::ISlmAdapter                             u:object_r:hal_slmadapter_hwservice:s0
 vendor.qti.hardware.dsp::IDspService                                    u:object_r:hal_dspmanager_hwservice:s0
+vendor.qti.hardware.mwqemadapter::IMwqemAdapter                         u:object_r:hal_mwqemadapter_hwservice:s0
diff --git a/vendor/qcom/common/qspmhal.te b/vendor/qcom/common/qspmhal.te
index b87ea36..4f1aae6 100644
--- a/vendor/qcom/common/qspmhal.te
+++ b/vendor/qcom/common/qspmhal.te
@@ -27,3 +27,4 @@ dontaudit google_camera_app hal_qspmhal_hwservice:hwservice_manager find;
 
 dontaudit untrusted_app_29 hal_qspmhal_hwservice:hwservice_manager find;
 dontaudit untrusted_app_27 hal_qspmhal_hwservice:hwservice_manager find;
+dontaudit untrusted_app_25 hal_qspmhal_hwservice:hwservice_manager find;
diff --git a/vendor/qcom/common/qtelephony.te b/vendor/qcom/common/qtelephony.te
index a1cad86..c93440a 100644
--- a/vendor/qcom/common/qtelephony.te
+++ b/vendor/qcom/common/qtelephony.te
@@ -6,6 +6,7 @@ add_hwservice(qtelephony, vnd_atcmdfwd_hwservice)
 
 allow qtelephony app_api_service:service_manager find;
 allow qtelephony hal_imsrtp_hwservice:hwservice_manager find;
+allow qtelephony hal_telephony_service:service_manager find;
 allow qtelephony radio_service:service_manager find;
 allow qtelephony sysfs_diag:dir search;
 allow qtelephony sysfs_timestamp_switch:file r_file_perms;
diff --git a/vendor/qcom/common/seapp_contexts b/vendor/qcom/common/seapp_contexts
index 04ef88e..b899748 100644
--- a/vendor/qcom/common/seapp_contexts
+++ b/vendor/qcom/common/seapp_contexts
@@ -29,3 +29,8 @@ user=_app seinfo=platform name=org.codeaurora.ims isPrivApp=true domain=qtelepho
 #Add DeviceInfoHidlClient to vendor_qtelephony
 user=_app seinfo=platform name=com.qualcomm.qti.devicestatisticsservice domain=qtelephony type=app_data_file levelFrom=all
 
+#Add ExtTelephonyService to vendor_qtelephony
+user=_app seinfo=platform name=com.qti.phone domain=qtelephony type=app_data_file levelFrom=all
+
+# QtiTelephonyService app
+user=_app seinfo=platform name=com.qualcomm.qti.telephonyservice domain=qtelephony type=app_data_file levelFrom=all
diff --git a/vendor/qcom/common/service.te b/vendor/qcom/common/service.te
index e69de29..f104da7 100644
--- a/vendor/qcom/common/service.te
+++ b/vendor/qcom/common/service.te
@@ -0,0 +1 @@
+type hal_telephony_service, service_manager_type, vendor_service;
diff --git a/vendor/qcom/common/service_contexts b/vendor/qcom/common/service_contexts
new file mode 100644
index 0000000..405f768
--- /dev/null
+++ b/vendor/qcom/common/service_contexts
@@ -0,0 +1 @@
+vendor.qti.hardware.radio.ims.IImsRadio/default        u:object_r:hal_telephony_service:s0