diff --git a/legacy/whitechapel_pro/hwservice.te b/legacy/whitechapel_pro/hwservice.te
index 9b259abf..c4c04fd4 100644
--- a/legacy/whitechapel_pro/hwservice.te
+++ b/legacy/whitechapel_pro/hwservice.te
@@ -1,6 +1,3 @@
-# GRIL service
-type hal_radioext_hwservice, hwservice_manager_type;
-
 # WLC
 type hal_wlc_hwservice, hwservice_manager_type;
 
diff --git a/legacy/whitechapel_pro/hwservice_contexts b/legacy/whitechapel_pro/hwservice_contexts
index 9fff5cb8..dbff7ee9 100644
--- a/legacy/whitechapel_pro/hwservice_contexts
+++ b/legacy/whitechapel_pro/hwservice_contexts
@@ -4,5 +4,3 @@ vendor.goodix.hardware.biometrics.fingerprint::IGoodixFingerprintDaemon
 # Wireless charger hal
 vendor.google.wireless_charger::IWirelessCharger                                   u:object_r:hal_wlc_hwservice:s0
 
-# GRIL HAL
-vendor.google.radioext::IRadioExt                                                  u:object_r:hal_radioext_hwservice:s0
diff --git a/legacy/whitechapel_pro/seapp_contexts b/legacy/whitechapel_pro/seapp_contexts
index 5e70b4ea..fedf5987 100644
--- a/legacy/whitechapel_pro/seapp_contexts
+++ b/legacy/whitechapel_pro/seapp_contexts
@@ -28,9 +28,6 @@ user=_app isPrivApp=true seinfo=platform name=com.android.omadm.service domain=o
 # HbmSVManager
 user=_app seinfo=platform name=com.android.hbmsvmanager domain=hbmsvmanager_app type=app_data_file levelFrom=all
 
-# grilservice
-user=_app isPrivApp=true name=com.google.android.grilservice domain=grilservice_app levelFrom=all
-
 # Domain for connectivity monitor
 user=_app isPrivApp=true seinfo=platform name=com.google.android.connectivitymonitor domain=con_monitor_app type=app_data_file levelFrom=all
 
diff --git a/legacy/whitechapel_pro/grilservice_app.te b/vendor/grilservice_app.te
similarity index 100%
rename from legacy/whitechapel_pro/grilservice_app.te
rename to vendor/grilservice_app.te
diff --git a/vendor/hwservice.te b/vendor/hwservice.te
index 90944b44..19320cb0 100644
--- a/vendor/hwservice.te
+++ b/vendor/hwservice.te
@@ -1,6 +1,9 @@
 # dmd servcie
 type hal_vendor_oem_hwservice, hwservice_manager_type;
 
+# GRIL service
+type hal_radioext_hwservice, hwservice_manager_type;
+
 # rild service
 type hal_exynos_rild_hwservice, hwservice_manager_type;
 
diff --git a/vendor/hwservice_contexts b/vendor/hwservice_contexts
index ac4d64c1..6453a566 100644
--- a/vendor/hwservice_contexts
+++ b/vendor/hwservice_contexts
@@ -4,3 +4,5 @@ vendor.samsung_slsi.telephony.hardware.oemservice::IOemService
 # rild HAL
 vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal        u:object_r:hal_exynos_rild_hwservice:s0
 
+# GRIL HAL
+vendor.google.radioext::IRadioExt                                                  u:object_r:hal_radioext_hwservice:s0
diff --git a/vendor/seapp_contexts b/vendor/seapp_contexts
index ddb8e529..94acdb76 100644
--- a/vendor/seapp_contexts
+++ b/vendor/seapp_contexts
@@ -7,5 +7,8 @@ user=_app seinfo=platform name=com.google.googlecbrs domain=cbrs_setup_app type=
 # Modem Diagnostic System
 user=_app isPrivApp=true seinfo=mds name=com.google.mds domain=modem_diagnostic_app type=app_data_file levelFrom=user
 
+# grilservice
+user=_app isPrivApp=true name=com.google.android.grilservice domain=grilservice_app levelFrom=all
+
 # exynos apps
 user=_app isPrivApp=true name=com.samsung.slsi.telephony.oemril domain=oemrilservice_app levelFrom=all