Merge "Revert "[FP5-166] Module detection"" into t6490_fp5_qssi_dev
diff --git a/generic/private/dataservice_app.te b/generic/private/dataservice_app.te
index f2dce4a..d78d89e 100755
--- a/generic/private/dataservice_app.te
+++ b/generic/private/dataservice_app.te
@@ -33,6 +33,7 @@
 add_service(vendor_dataservice_app, vendor_cne_service)
 add_service(vendor_dataservice_app, vendor_dpmservice)
 add_service(vendor_dataservice_app, uce_service)
+add_service(vendor_dataservice_app, vendor_imsdc_service)
 allow vendor_dataservice_app {
   app_api_service
   system_api_service
@@ -45,7 +46,7 @@
 
 hwbinder_use(vendor_dataservice_app)
 
-add_service(vendor_dataservice_app, vendor_dpmservice)
+
 allow vendor_dataservice_app system_app_data_file:dir create_dir_perms;
 allow vendor_dataservice_app vendor_dpmd_socket:sock_file write;
 allow vendor_dataservice_app vendor_dpmd_data_file:dir rw_dir_perms;
diff --git a/generic/private/platform_app.te b/generic/private/platform_app.te
index c71024b..da23db5 100644
--- a/generic/private/platform_app.te
+++ b/generic/private/platform_app.te
@@ -54,6 +54,9 @@
 # been defined
 typeattribute platform_app hal_wifi_supplicant_client;
 
+#allow platform_app to interact with IWifi hal
+typeattribute platform_app hal_wifi_client;
+
 #SystemUI needs to access the property ril.cdma.inecmmode
 get_prop(platform_app, radio_cdma_ecm_prop)
 
diff --git a/generic/private/service.te b/generic/private/service.te
index 076d12d..b9d2f1b 100644
--- a/generic/private/service.te
+++ b/generic/private/service.te
@@ -25,6 +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 vendor_cne_service,                 service_manager_type;
+type vendor_imsdc_service,               service_manager_type;
 type vendor_seemp_service,               service_manager_type;
 type vendor_dpmservice,                  service_manager_type;
 type vendor_MinkBinderSvc,               app_api_service, service_manager_type;
diff --git a/generic/private/service_contexts b/generic/private/service_contexts
index 6ee05c4..7413673 100644
--- a/generic/private/service_contexts
+++ b/generic/private/service_contexts
@@ -25,6 +25,7 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 cneservice                                           u:object_r:vendor_cne_service:s0
+vendor.imsdcservice                                  u:object_r:vendor_imsdc_service:s0
 com.qualcomm.qti.ustaservice.USTAServiceImpl         u:object_r:vendor_usta_app_service:s0
 dpmservice                                     u:object_r:vendor_dpmservice:s0
 MinkBinderSvc                                  u:object_r:vendor_MinkBinderSvc:s0
diff --git a/generic/public/attributes b/generic/public/attributes
index 4c1d31b..3ddec19 100644
--- a/generic/public/attributes
+++ b/generic/public/attributes
@@ -293,6 +293,10 @@
 attribute vendor_hal_qms_qti_client;
 attribute vendor_hal_qms_qti_server;
 
+attribute vendor_hal_dcservice_qti;
+attribute vendor_hal_dcservice_qti_client;
+attribute vendor_hal_dcservice_qti_server;
+
 attribute vendor_hal_minkipc;
 attribute vendor_hal_minkipc_client;
 attribute vendor_hal_minkipc_server;