Merge ee6be5f18d71a30e52b259653eb1cf482ae4a9ac on remote branch
Change-Id: I7cb5c59bb7b8b05fa9eaa8db83f442e8e73d8521
diff --git a/generic/private/qtelephony.te b/generic/private/qtelephony.te
index b838cc2..1ba8237 100644
--- a/generic/private/qtelephony.te
+++ b/generic/private/qtelephony.te
@@ -32,7 +32,6 @@
hwbinder_use(vendor_qtelephony);
get_prop(vendor_qtelephony, hwservicemanager_prop);
-add_hwservice(vendor_qtelephony, vendor_hal_atfwd_hwservice);
userdebug_or_eng(`
hal_client_domain( vendor_qtelephony, vendor_hal_diaghal)
diff --git a/generic/private/radio.te b/generic/private/radio.te
index 9f6cb84..cd164b5 100644
--- a/generic/private/radio.te
+++ b/generic/private/radio.te
@@ -27,3 +27,4 @@
hwbinder_use(radio)
allow radio mediaextractor_service:service_manager find;
+add_hwservice(radio, vendor_hal_atfwd_hwservice);
diff --git a/generic/private/seapp_contexts b/generic/private/seapp_contexts
index 43bb51e..bb18965 100644
--- a/generic/private/seapp_contexts
+++ b/generic/private/seapp_contexts
@@ -30,7 +30,7 @@
user=radio seinfo=platform name=.dataservices domain=vendor_dataservice_app type=radio_data_file
# AtFwd app
-user=_app seinfo=platform name=com.qualcomm.telephony domain=vendor_qtelephony type=app_data_file levelFrom=all
+user=_app seinfo=platform name=com.qualcomm.telephony domain=radio_service type=app_data_file levelFrom=all
#Add new domain for ims app
user=_app seinfo=platform name=org.codeaurora.ims isPrivApp=true domain=vendor_qtelephony type=app_data_file levelFrom=all
diff --git a/generic/private/service_contexts b/generic/private/service_contexts
index 365d35f..853ae6b 100644
--- a/generic/private/service_contexts
+++ b/generic/private/service_contexts
@@ -26,3 +26,4 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cneservice u:object_r:vendor_cne_service:s0
com.qualcomm.qti.ustaservice.USTAServiceImpl u:object_r:vendor_usta_app_service:s0
+vendor.qti.hardware.radio.atcmdfwd.IAtCmdFwd/AtCmdFwdAidl u:object_r:radio_service:s0
diff --git a/legacy/vendor/common/atfwd.te b/legacy/vendor/common/atfwd.te
index a937b3c..d2d735b 100644
--- a/legacy/vendor/common/atfwd.te
+++ b/legacy/vendor/common/atfwd.te
@@ -35,6 +35,8 @@
binder_call(atfwd, system_app);
+binder_call(atfwd, radio)
+
r_dir_file(atfwd, sysfs_data);
set_prop(atfwd, vendor_radio_prop)