From 1685969e605263ad55f1f75e50584dc0f12bd99a Mon Sep 17 00:00:00 2001 From: Charlie Yang Date: Mon, 16 Sep 2024 07:21:11 +0000 Subject: [PATCH] Revert "Allow devices that use HIDL to find AIDL radio_ext_service" Revert submission 29238469-gril-selinux Reason for revert: b/367183524 - build break Reverted changes: /q/submissionid:29238469-gril-selinux Change-Id: Ica10c6ee500389223256e328d182c9495a826b06 --- gril/aidl/2.0/gril_aidl.mk | 1 - gril/aidl/2.0/sepolicy/grilservice_app.te | 4 ++-- gril/aidl/2.0/sepolicy/hal_aidl_radio_ext.te | 2 +- gril/aidl/2.0/sepolicy/service.te | 2 ++ gril/{common => aidl/2.0}/sepolicy/service_contexts | 2 +- gril/hidl/1.7/gril_hidl.mk | 1 - gril/hidl/1.7/sepolicy/grilservice_app.te | 2 -- modem/radio_ext/radio_ext.mk | 1 - {gril/common => modem/radio_ext}/sepolicy/service.te | 1 - 9 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 gril/aidl/2.0/sepolicy/service.te rename gril/{common => aidl/2.0}/sepolicy/service_contexts (64%) rename {gril/common => modem/radio_ext}/sepolicy/service.te (68%) diff --git a/gril/aidl/2.0/gril_aidl.mk b/gril/aidl/2.0/gril_aidl.mk index d4fa9e9..b7d5133 100644 --- a/gril/aidl/2.0/gril_aidl.mk +++ b/gril/aidl/2.0/gril_aidl.mk @@ -1,4 +1,3 @@ PRODUCT_PACKAGES += vendor.google.radioext@1.0-service DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/gril/aidl/2.0/compatibility_matrix.xml BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gril/aidl/2.0/sepolicy -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gril/common/sepolicy diff --git a/gril/aidl/2.0/sepolicy/grilservice_app.te b/gril/aidl/2.0/sepolicy/grilservice_app.te index 812c8a2..8f49afa 100644 --- a/gril/aidl/2.0/sepolicy/grilservice_app.te +++ b/gril/aidl/2.0/sepolicy/grilservice_app.te @@ -1,4 +1,4 @@ -# allow grilservice_app to find hal_radio_ext_service -allow grilservice_app hal_radio_ext_service:service_manager find; +# allow grilservice_app to find hal_aidl_radio_ext_service +allow grilservice_app hal_aidl_radio_ext_service:service_manager find; binder_call(grilservice_app, hal_aidl_radio_ext) binder_call(grilservice_app, twoshay) diff --git a/gril/aidl/2.0/sepolicy/hal_aidl_radio_ext.te b/gril/aidl/2.0/sepolicy/hal_aidl_radio_ext.te index 68dd397..ad6c86b 100644 --- a/gril/aidl/2.0/sepolicy/hal_aidl_radio_ext.te +++ b/gril/aidl/2.0/sepolicy/hal_aidl_radio_ext.te @@ -12,7 +12,7 @@ binder_call(hal_aidl_radio_ext, servicemanager) binder_call(hal_aidl_radio_ext, grilservice_app) binder_call(hal_aidl_radio_ext, hal_bluetooth_btlinux) -add_service(hal_aidl_radio_ext, hal_radio_ext_service) +add_service(hal_aidl_radio_ext, hal_aidl_radio_ext_service) # RW /dev/oem_ipc0 allow hal_aidl_radio_ext radio_device:chr_file rw_file_perms; diff --git a/gril/aidl/2.0/sepolicy/service.te b/gril/aidl/2.0/sepolicy/service.te new file mode 100644 index 0000000..24aa71e --- /dev/null +++ b/gril/aidl/2.0/sepolicy/service.te @@ -0,0 +1,2 @@ +# Radio Ext AIDL service +type hal_aidl_radio_ext_service, hal_service_type, protected_service, service_manager_type; diff --git a/gril/common/sepolicy/service_contexts b/gril/aidl/2.0/sepolicy/service_contexts similarity index 64% rename from gril/common/sepolicy/service_contexts rename to gril/aidl/2.0/sepolicy/service_contexts index 7e50c2e..7b96182 100644 --- a/gril/common/sepolicy/service_contexts +++ b/gril/aidl/2.0/sepolicy/service_contexts @@ -1 +1 @@ -vendor.google.radio_ext.IRadioExt/default u:object_r:hal_radio_ext_service:s0 +vendor.google.radio_ext.IRadioExt/default u:object_r:hal_aidl_radio_ext_service:s0 diff --git a/gril/hidl/1.7/gril_hidl.mk b/gril/hidl/1.7/gril_hidl.mk index 0008a5d..fcd5ef8 100644 --- a/gril/hidl/1.7/gril_hidl.mk +++ b/gril/hidl/1.7/gril_hidl.mk @@ -1,4 +1,3 @@ PRODUCT_PACKAGES += vendor.google.radioext@1.0-service DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/gril/hidl/1.7/compatibility_matrix.xml BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gril/hidl/1.7/sepolicy -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gril/common/sepolicy diff --git a/gril/hidl/1.7/sepolicy/grilservice_app.te b/gril/hidl/1.7/sepolicy/grilservice_app.te index 3a170b8..43da795 100644 --- a/gril/hidl/1.7/sepolicy/grilservice_app.te +++ b/gril/hidl/1.7/sepolicy/grilservice_app.te @@ -1,4 +1,2 @@ -# allow grilservice_app to find hal_radio_ext_service -allow grilservice_app hal_radio_ext_service:service_manager find; # allow grilservice_app to binder call hal_radioext_default binder_call(grilservice_app, hal_radioext_default) diff --git a/modem/radio_ext/radio_ext.mk b/modem/radio_ext/radio_ext.mk index 1df3bcc..6750fdd 100644 --- a/modem/radio_ext/radio_ext.mk +++ b/modem/radio_ext/radio_ext.mk @@ -3,4 +3,3 @@ PRODUCT_PACKAGES += vendor.google.radio_ext-service DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/modem/radio_ext/compatibility_matrix.xml BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/modem/radio_ext/sepolicy -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gril/common/sepolicy diff --git a/gril/common/sepolicy/service.te b/modem/radio_ext/sepolicy/service.te similarity index 68% rename from gril/common/sepolicy/service.te rename to modem/radio_ext/sepolicy/service.te index ee6fb77..7288ef1 100644 --- a/gril/common/sepolicy/service.te +++ b/modem/radio_ext/sepolicy/service.te @@ -1,3 +1,2 @@ # Radio Ext AIDL service -# Shared definition so a single type is referenced type hal_radio_ext_service, hal_service_type, protected_service, service_manager_type;