From 406eea24bad8787a9099624ec7e229c2879b6b45 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Thu, 28 Mar 2024 17:20:53 +0000 Subject: [PATCH 1/2] Revert "sepolicy: Allow PixelGnss to connect to Chre HAL" Revert submission 26593083-lassen_pps Reason for revert: Culprit for test breakages in b/331680556. Will be verifying through ABTD for confirmation and before submitting the revert. Bug: b/331680556 Reverted changes: /q/submissionid:26593083-lassen_pps Change-Id: I97e29eaf09238d708fb9d941a5988ad42d583655 --- gps/pixel/sepolicy/hal_gnss_pixel.te | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gps/pixel/sepolicy/hal_gnss_pixel.te b/gps/pixel/sepolicy/hal_gnss_pixel.te index 0d9a8b5..512ecc9 100644 --- a/gps/pixel/sepolicy/hal_gnss_pixel.te +++ b/gps/pixel/sepolicy/hal_gnss_pixel.te @@ -12,10 +12,3 @@ allow hal_gnss_pixel sysfs_modem_state:file r_file_perms; #Toggle coredump node allow hal_gnss_pixel sysfs_gps:file rw_file_perms; - -# Allow access to CHRE multiclient HAL. -get_prop(hal_gnss_pixel, vendor_chre_hal_prop) - -# Allow binder to CHRE. -binder_call(hal_gnss_pixel, hal_contexthub_default) -allow hal_gnss_pixel hal_contexthub_service:service_manager find; From 29035f24bc74c231e475d5d09e352551bb2e3893 Mon Sep 17 00:00:00 2001 From: mikeyuewang Date: Wed, 27 Mar 2024 17:34:41 +0000 Subject: [PATCH 2/2] Move the sysfs_modem_state from a product folder to gs-common Bug: 331202327 Change-Id: Id9176ef2b8aa50b178e0cadf60d8a34876433377 --- gps/pixel/sepolicy/file.te | 1 - radio/sepolicy/file.te | 3 +++ {gps/pixel => radio}/sepolicy/genfs_contexts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 gps/pixel/sepolicy/file.te rename {gps/pixel => radio}/sepolicy/genfs_contexts (99%) diff --git a/gps/pixel/sepolicy/file.te b/gps/pixel/sepolicy/file.te deleted file mode 100644 index 79e95ab..0000000 --- a/gps/pixel/sepolicy/file.te +++ /dev/null @@ -1 +0,0 @@ -type sysfs_modem_state, sysfs_type, fs_type; diff --git a/radio/sepolicy/file.te b/radio/sepolicy/file.te index 02d0209..95b24c0 100644 --- a/radio/sepolicy/file.te +++ b/radio/sepolicy/file.te @@ -1,6 +1,9 @@ # Data type tcpdump_vendor_data_file, file_type, data_file_type; +# Modem +type sysfs_modem_state, sysfs_type, fs_type; + userdebug_or_eng(` typeattribute tcpdump_vendor_data_file mlstrustedobject; ') diff --git a/gps/pixel/sepolicy/genfs_contexts b/radio/sepolicy/genfs_contexts similarity index 99% rename from gps/pixel/sepolicy/genfs_contexts rename to radio/sepolicy/genfs_contexts index 494aa97..039f329 100644 --- a/gps/pixel/sepolicy/genfs_contexts +++ b/radio/sepolicy/genfs_contexts @@ -1,2 +1,3 @@ # modem state node genfscon sysfs /devices/platform/cpif/modem_state u:object_r:sysfs_modem_state:s0 +