sepolicy_vndr: Fix compilation issues for newer upgrade

Change-Id: I60686d0066a1aa099a7dffbca091c9a7e2bac7f8

10 files changed, 8 insertions, 14 deletions

diff --git a/generic/vendor/common/init-qti-ims-sh.te b/generic/vendor/common/init-qti-ims-sh.te
index 1c1fbdaa..d23b6f93 100644
--- a/generic/vendor/common/init-qti-ims-sh.te
+++ b/generic/vendor/common/init-qti-ims-sh.te
@@ -35,6 +35,3 @@ allow vendor_init-qti-ims-sh vendor_toolbox_exec:file rx_file_perms;
 
 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(vendor_init-qti-ims-sh, exported2_default_prop)
diff --git a/generic/vendor/common/init_shell.te b/generic/vendor/common/init_shell.te
index 02e0d008..05ef372d 100644
--- a/generic/vendor/common/init_shell.te
+++ b/generic/vendor/common/init_shell.te
@@ -83,7 +83,7 @@ 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)
+get_prop(vendor_qti_init_shell, radio_control_prop)
 set_prop(vendor_qti_init_shell, vendor_gpu_prop)
 set_prop(vendor_qti_init_shell, vendor_sensors_prop)
 set_prop(vendor_qti_init_shell, vendor_adsprpc_prop)
diff --git a/generic/vendor/common/qtidataservices_app.te b/generic/vendor/common/qtidataservices_app.te
index a800c1e2..a6aeede5 100644
--- a/generic/vendor/common/qtidataservices_app.te
+++ b/generic/vendor/common/qtidataservices_app.te
@@ -32,7 +32,7 @@ add_hwservice(vendor_qtidataservices_app, vendor_hal_cacert_hwservice)
 hwbinder_use(vendor_qtidataservices_app)
 
 get_prop(vendor_qtidataservices_app, vendor_cnd_prop)
-set_prop(vendor_qtidataservices_app,exported_radio_prop)
+set_prop(vendor_qtidataservices_app, telephony_status_prop)
 
 allow vendor_qtidataservices_app { app_api_service activity_service }:service_manager find;
 allow vendor_qtidataservices_app self:qipcrtr_socket create_socket_perms_no_ioctl;
diff --git a/generic/vendor/common/rild.te b/generic/vendor/common/rild.te
index cd8ceb87..fe361a92 100644
--- a/generic/vendor/common/rild.te
+++ b/generic/vendor/common/rild.te
@@ -54,7 +54,7 @@ add_hwservice(rild, vendor_hal_iwlan_hwservice)
 add_hwservice(rild, vendor_hal_dataconnection_hwservice)
 hal_server_domain(rild, vendor_hal_dataconnection_qti)
 
-get_prop(rild, exported3_radio_prop)
+get_prop(rild, radio_control_prop)
 get_prop(rild, vendor_dataqdp_prop)
 
 allow rild vendor_qmuxd_socket:dir w_dir_perms;
diff --git a/generic/vendor/common/seapp_contexts b/generic/vendor/common/seapp_contexts
index d2baef84..1d4b4913 100644
--- a/generic/vendor/common/seapp_contexts
+++ b/generic/vendor/common/seapp_contexts
@@ -34,7 +34,7 @@ user=_app seinfo=platform name=com.qualcomm.timeservice domain=vendor_timeservic
 user=_app seinfo=platform name=.qtidataservices domain=vendor_qtidataservices_app type=app_data_file levelFrom=all
 
 #Add new domain for imshelper service
-user=radio seinfo=platform name=.imshelperservice domain=vendor_imshelper_app type=vendor_imshelper_app_data_file
+user=radio seinfo=platform name=.imshelperservice domain=vendor_imshelper_app type=vendor_radio_data_file
 
 #Add new domain for power off alarm app
 user=_app seinfo=platform name=com.qualcomm.qti.poweroffalarm domain=vendor_poweroffalarm_app type=app_data_file levelFrom=all
diff --git a/legacy/vendor/common/init-qti-ims-sh.te b/legacy/vendor/common/init-qti-ims-sh.te
index 6ab358ab..843a6db4 100644
--- a/legacy/vendor/common/init-qti-ims-sh.te
+++ b/legacy/vendor/common/init-qti-ims-sh.te
@@ -34,6 +34,3 @@ allow init-qti-ims-sh vendor_shell_exec:file rx_file_perms;
 allow init-qti-ims-sh vendor_toolbox_exec:file rx_file_perms;
 
 set_prop(init-qti-ims-sh, qcom_ims_prop)
-
-# for ro.build.product
-get_prop(init-qti-ims-sh, exported2_default_prop)
diff --git a/legacy/vendor/common/init_shell.te b/legacy/vendor/common/init_shell.te
index 537237cf..9fe9657d 100644
--- a/legacy/vendor/common/init_shell.te
+++ b/legacy/vendor/common/init_shell.te
@@ -125,7 +125,7 @@ set_prop(qti_init_shell, reschedule_service_prop)
 #Needed for setting hvdcp properties from post_boot
 set_prop(qti_init_shell, hvdcp_opti_prop)
 
-get_prop(qti_init_shell, exported3_radio_prop)
+get_prop(qti_init_shell, radio_control_prop)
 set_prop(qti_init_shell, vendor_gpu_prop)
 
 allow qti_init_shell efs_boot_dev:blk_file r_file_perms;
diff --git a/legacy/vendor/common/qtidataservices_app.te b/legacy/vendor/common/qtidataservices_app.te
index d21682b0..50304a34 100755
--- a/legacy/vendor/common/qtidataservices_app.te
+++ b/legacy/vendor/common/qtidataservices_app.te
@@ -32,7 +32,7 @@ add_hwservice(qtidataservices_app, hal_cacert_hwservice)
 hwbinder_use(qtidataservices_app)
 
 get_prop(qtidataservices_app, cnd_vendor_prop)
-set_prop(qtidataservices_app, exported_radio_prop)
+set_prop(qtidataservices_app, telephony_status_prop)
 
 allow qtidataservices_app { app_api_service activity_service }:service_manager find;
 allow qtidataservices_app self:qipcrtr_socket create_socket_perms_no_ioctl;
diff --git a/legacy/vendor/common/rild.te b/legacy/vendor/common/rild.te
index 588bc617..6499153a 100644
--- a/legacy/vendor/common/rild.te
+++ b/legacy/vendor/common/rild.te
@@ -80,7 +80,7 @@ add_hwservice(rild, hal_iwlan_hwservice)
 add_hwservice(rild, hal_dataconnection_hwservice)
 hal_server_domain(rild, hal_dataconnection_qti)
 
-get_prop(rild, exported3_radio_prop)
+get_prop(rild, radio_control_prop)
 set_prop(rild, vendor_xlat_prop)
 get_prop(rild, vendor_rild_libpath_prop)
 get_prop(rild, vendor_dataqdp_prop)
diff --git a/legacy/vendor/common/seapp_contexts b/legacy/vendor/common/seapp_contexts
index 1508e947..bced83e2 100644
--- a/legacy/vendor/common/seapp_contexts
+++ b/legacy/vendor/common/seapp_contexts
@@ -42,7 +42,7 @@ user=_app seinfo=platform name=com.qualcomm.timeservice domain=timeservice_app t
 user=system seinfo=platform name=com.qualcomm.qti.logkit domain=qti_logkit_app type=system_app_data_file
 
 #Add new domain for imshelper service
-user=system seinfo=platform name=.imshelperservice domain=imshelper_app type=imshelper_app_data_file
+user=system seinfo=platform name=.imshelperservice domain=imshelper_app type=radio_data_file
 
 #Add new domain for perfdump app
 user=system seinfo=platform name=com.qualcomm.qti.perfdump domain=perfdump_app type=system_app_data_file