From cbc4b64bd1bff8211ef43f8d32856bb342dafa52 Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Tue, 19 Sep 2023 03:45:02 +0000 Subject: [PATCH 1/4] Add radio_ext aidl to compatibility matrix Test: manual Bug: 285459428 Change-Id: Ic07926b2af7ea980575f4909ebe742efeb39ef82 --- modem/radio_ext/compatibility_matrix.xml | 10 ++++++++++ modem/radio_ext/radio_ext.mk | 5 +++++ modem/radio_ext/sepolicy/file_contexts | 1 + modem/radio_ext/sepolicy/hal_radio_ext.te | 11 +++++++++++ modem/radio_ext/sepolicy/service.te | 2 ++ modem/radio_ext/sepolicy/service_contexts | 1 + 6 files changed, 30 insertions(+) create mode 100644 modem/radio_ext/compatibility_matrix.xml create mode 100644 modem/radio_ext/radio_ext.mk create mode 100644 modem/radio_ext/sepolicy/file_contexts create mode 100644 modem/radio_ext/sepolicy/hal_radio_ext.te create mode 100644 modem/radio_ext/sepolicy/service.te create mode 100644 modem/radio_ext/sepolicy/service_contexts diff --git a/modem/radio_ext/compatibility_matrix.xml b/modem/radio_ext/compatibility_matrix.xml new file mode 100644 index 0000000..8d3adb4 --- /dev/null +++ b/modem/radio_ext/compatibility_matrix.xml @@ -0,0 +1,10 @@ + + + vendor.google.radio_ext + 1 + + IRadioExt + default + + + diff --git a/modem/radio_ext/radio_ext.mk b/modem/radio_ext/radio_ext.mk new file mode 100644 index 0000000..6750fdd --- /dev/null +++ b/modem/radio_ext/radio_ext.mk @@ -0,0 +1,5 @@ +PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces +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 diff --git a/modem/radio_ext/sepolicy/file_contexts b/modem/radio_ext/sepolicy/file_contexts new file mode 100644 index 0000000..cd4172c --- /dev/null +++ b/modem/radio_ext/sepolicy/file_contexts @@ -0,0 +1 @@ +/vendor/bin/hw/vendor\.google\.radio_ext-service u:object_r:hal_radio_ext_exec:s0 diff --git a/modem/radio_ext/sepolicy/hal_radio_ext.te b/modem/radio_ext/sepolicy/hal_radio_ext.te new file mode 100644 index 0000000..203ae3b --- /dev/null +++ b/modem/radio_ext/sepolicy/hal_radio_ext.te @@ -0,0 +1,11 @@ +type hal_radio_ext, domain; +type hal_radio_ext_exec, exec_type, vendor_file_type, file_type; + +init_daemon_domain(hal_radio_ext) + +binder_call(hal_radio_ext, servicemanager) +add_service(hal_radio_ext, hal_radio_ext_service) + +# Allow access to the backlight driver to set ssc_mode +allow hal_radio_ext sysfs_leds:dir search; +allow hal_radio_ext sysfs_leds:file rw_file_perms; diff --git a/modem/radio_ext/sepolicy/service.te b/modem/radio_ext/sepolicy/service.te new file mode 100644 index 0000000..7288ef1 --- /dev/null +++ b/modem/radio_ext/sepolicy/service.te @@ -0,0 +1,2 @@ +# Radio Ext AIDL service +type hal_radio_ext_service, hal_service_type, protected_service, service_manager_type; diff --git a/modem/radio_ext/sepolicy/service_contexts b/modem/radio_ext/sepolicy/service_contexts new file mode 100644 index 0000000..44f0766 --- /dev/null +++ b/modem/radio_ext/sepolicy/service_contexts @@ -0,0 +1 @@ +vendor.google.radio_ext.IRadioExt/default u:object_r:hal_radio_ext_service:s0 \ No newline at end of file From 5b47a8b6a18c926cb3d6a6daf42eabcfa420c417 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Mon, 4 Sep 2023 15:49:19 +0000 Subject: [PATCH 2/4] sepolicy: add permission for audio offload-effects of pixelstats-vend Bug: 301046889 Test: Manually test passed Change-Id: Ia47405d4ac73d1e09fdea6c6a4422955b77e2552 --- audio/sepolicy/common/genfs_contexts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/audio/sepolicy/common/genfs_contexts b/audio/sepolicy/common/genfs_contexts index 013b913..deceeac 100644 --- a/audio/sepolicy/common/genfs_contexts +++ b/audio/sepolicy/common/genfs_contexts @@ -18,3 +18,5 @@ genfscon sysfs /devices/platform/audiometrics/adapted_info_active_duration u:ob genfscon sysfs /devices/platform/audiometrics/pcm_count u:object_r:sysfs_pixelstats:s0 genfscon sysfs /devices/platform/audiometrics/pcm_latency u:object_r:sysfs_pixelstats:s0 genfscon sysfs /devices/platform/audiometrics/call_count u:object_r:sysfs_pixelstats:s0 +genfscon sysfs /devices/platform/audiometrics/offload_effects_id u:object_r:sysfs_pixelstats:s0 +genfscon sysfs /devices/platform/audiometrics/offload_effects_duration u:object_r:sysfs_pixelstats:s0 From e5988c99b7a1d23ebed11d1231597050b313f7cf Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Wed, 4 Oct 2023 13:11:33 +0000 Subject: [PATCH 3/4] Revert "Add radio_ext aidl to compatibility matrix" Reason for revert: Broke next target, b/303392497 Reverted changes: /q/submissionid:24799507-ak3_ssc_aidl Change-Id: I20c5834b71d0695f2fd4e7bc55785895410951d1 --- modem/radio_ext/compatibility_matrix.xml | 10 ---------- modem/radio_ext/radio_ext.mk | 5 ----- modem/radio_ext/sepolicy/file_contexts | 1 - modem/radio_ext/sepolicy/hal_radio_ext.te | 11 ----------- modem/radio_ext/sepolicy/service.te | 2 -- modem/radio_ext/sepolicy/service_contexts | 1 - 6 files changed, 30 deletions(-) delete mode 100644 modem/radio_ext/compatibility_matrix.xml delete mode 100644 modem/radio_ext/radio_ext.mk delete mode 100644 modem/radio_ext/sepolicy/file_contexts delete mode 100644 modem/radio_ext/sepolicy/hal_radio_ext.te delete mode 100644 modem/radio_ext/sepolicy/service.te delete mode 100644 modem/radio_ext/sepolicy/service_contexts diff --git a/modem/radio_ext/compatibility_matrix.xml b/modem/radio_ext/compatibility_matrix.xml deleted file mode 100644 index 8d3adb4..0000000 --- a/modem/radio_ext/compatibility_matrix.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - vendor.google.radio_ext - 1 - - IRadioExt - default - - - diff --git a/modem/radio_ext/radio_ext.mk b/modem/radio_ext/radio_ext.mk deleted file mode 100644 index 6750fdd..0000000 --- a/modem/radio_ext/radio_ext.mk +++ /dev/null @@ -1,5 +0,0 @@ -PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces -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 diff --git a/modem/radio_ext/sepolicy/file_contexts b/modem/radio_ext/sepolicy/file_contexts deleted file mode 100644 index cd4172c..0000000 --- a/modem/radio_ext/sepolicy/file_contexts +++ /dev/null @@ -1 +0,0 @@ -/vendor/bin/hw/vendor\.google\.radio_ext-service u:object_r:hal_radio_ext_exec:s0 diff --git a/modem/radio_ext/sepolicy/hal_radio_ext.te b/modem/radio_ext/sepolicy/hal_radio_ext.te deleted file mode 100644 index 203ae3b..0000000 --- a/modem/radio_ext/sepolicy/hal_radio_ext.te +++ /dev/null @@ -1,11 +0,0 @@ -type hal_radio_ext, domain; -type hal_radio_ext_exec, exec_type, vendor_file_type, file_type; - -init_daemon_domain(hal_radio_ext) - -binder_call(hal_radio_ext, servicemanager) -add_service(hal_radio_ext, hal_radio_ext_service) - -# Allow access to the backlight driver to set ssc_mode -allow hal_radio_ext sysfs_leds:dir search; -allow hal_radio_ext sysfs_leds:file rw_file_perms; diff --git a/modem/radio_ext/sepolicy/service.te b/modem/radio_ext/sepolicy/service.te deleted file mode 100644 index 7288ef1..0000000 --- a/modem/radio_ext/sepolicy/service.te +++ /dev/null @@ -1,2 +0,0 @@ -# Radio Ext AIDL service -type hal_radio_ext_service, hal_service_type, protected_service, service_manager_type; diff --git a/modem/radio_ext/sepolicy/service_contexts b/modem/radio_ext/sepolicy/service_contexts deleted file mode 100644 index 44f0766..0000000 --- a/modem/radio_ext/sepolicy/service_contexts +++ /dev/null @@ -1 +0,0 @@ -vendor.google.radio_ext.IRadioExt/default u:object_r:hal_radio_ext_service:s0 \ No newline at end of file From 6469490bad102c9b4a2063b08b61fe5448f9c0ab Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Wed, 4 Oct 2023 13:11:33 +0000 Subject: [PATCH 4/4] Revert "Add radio_ext aidl to compatibility matrix" Reason for revert: Broke next target, b/303392497 Reverted changes: /q/submissionid:24799507-ak3_ssc_aidl Change-Id: I20c5834b71d0695f2fd4e7bc55785895410951d1 Merged-In: I20c5834b71d0695f2fd4e7bc55785895410951d1 --- modem/radio_ext/compatibility_matrix.xml | 10 ---------- modem/radio_ext/radio_ext.mk | 5 ----- modem/radio_ext/sepolicy/file_contexts | 1 - modem/radio_ext/sepolicy/hal_radio_ext.te | 11 ----------- modem/radio_ext/sepolicy/service.te | 2 -- modem/radio_ext/sepolicy/service_contexts | 1 - 6 files changed, 30 deletions(-) delete mode 100644 modem/radio_ext/compatibility_matrix.xml delete mode 100644 modem/radio_ext/radio_ext.mk delete mode 100644 modem/radio_ext/sepolicy/file_contexts delete mode 100644 modem/radio_ext/sepolicy/hal_radio_ext.te delete mode 100644 modem/radio_ext/sepolicy/service.te delete mode 100644 modem/radio_ext/sepolicy/service_contexts diff --git a/modem/radio_ext/compatibility_matrix.xml b/modem/radio_ext/compatibility_matrix.xml deleted file mode 100644 index 8d3adb4..0000000 --- a/modem/radio_ext/compatibility_matrix.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - vendor.google.radio_ext - 1 - - IRadioExt - default - - - diff --git a/modem/radio_ext/radio_ext.mk b/modem/radio_ext/radio_ext.mk deleted file mode 100644 index 6750fdd..0000000 --- a/modem/radio_ext/radio_ext.mk +++ /dev/null @@ -1,5 +0,0 @@ -PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces -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 diff --git a/modem/radio_ext/sepolicy/file_contexts b/modem/radio_ext/sepolicy/file_contexts deleted file mode 100644 index cd4172c..0000000 --- a/modem/radio_ext/sepolicy/file_contexts +++ /dev/null @@ -1 +0,0 @@ -/vendor/bin/hw/vendor\.google\.radio_ext-service u:object_r:hal_radio_ext_exec:s0 diff --git a/modem/radio_ext/sepolicy/hal_radio_ext.te b/modem/radio_ext/sepolicy/hal_radio_ext.te deleted file mode 100644 index 203ae3b..0000000 --- a/modem/radio_ext/sepolicy/hal_radio_ext.te +++ /dev/null @@ -1,11 +0,0 @@ -type hal_radio_ext, domain; -type hal_radio_ext_exec, exec_type, vendor_file_type, file_type; - -init_daemon_domain(hal_radio_ext) - -binder_call(hal_radio_ext, servicemanager) -add_service(hal_radio_ext, hal_radio_ext_service) - -# Allow access to the backlight driver to set ssc_mode -allow hal_radio_ext sysfs_leds:dir search; -allow hal_radio_ext sysfs_leds:file rw_file_perms; diff --git a/modem/radio_ext/sepolicy/service.te b/modem/radio_ext/sepolicy/service.te deleted file mode 100644 index 7288ef1..0000000 --- a/modem/radio_ext/sepolicy/service.te +++ /dev/null @@ -1,2 +0,0 @@ -# Radio Ext AIDL service -type hal_radio_ext_service, hal_service_type, protected_service, service_manager_type; diff --git a/modem/radio_ext/sepolicy/service_contexts b/modem/radio_ext/sepolicy/service_contexts deleted file mode 100644 index 44f0766..0000000 --- a/modem/radio_ext/sepolicy/service_contexts +++ /dev/null @@ -1 +0,0 @@ -vendor.google.radio_ext.IRadioExt/default u:object_r:hal_radio_ext_service:s0 \ No newline at end of file