From 41c22587a2cadf6277723d6cd93d4124e016530a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Fri, 12 Apr 2024 21:58:43 +0000 Subject: [PATCH] Remove rlsservice sepolicy. rlsservice is not included on zuma and later, only gs101/gs201. Relevant code search link: https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:vendor/google/services/LyricCameraHAL/src/apex/Android.bp;l=26;drc=e4b49a6d945df6d5210c35251de8046b162d799d Bug: 278627483 Test: presubmit Change-Id: I15398ddeea8c0a10920c987e55789ba4a8322774 --- legacy/whitechapel_pro/vndservice_contexts | 1 - vendor/file_contexts | 1 - vendor/hal_camera_default.te | 8 ------ vendor/rlsservice.te | 32 ---------------------- 4 files changed, 42 deletions(-) delete mode 100644 legacy/whitechapel_pro/vndservice_contexts delete mode 100644 vendor/rlsservice.te diff --git a/legacy/whitechapel_pro/vndservice_contexts b/legacy/whitechapel_pro/vndservice_contexts deleted file mode 100644 index 66cab482..00000000 --- a/legacy/whitechapel_pro/vndservice_contexts +++ /dev/null @@ -1 +0,0 @@ -rlsservice u:object_r:rls_service:s0 diff --git a/vendor/file_contexts b/vendor/file_contexts index 8e92d3e1..b45d1ecb 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -13,7 +13,6 @@ /vendor/bin/dump/dump_wlan\.sh u:object_r:dump_wlan_exec:s0 /vendor/bin/dump/dump_gsa\.sh u:object_r:dump_gsa_exec:s0 /vendor/bin/dump/dump_power u:object_r:dump_power_exec:s0 -/vendor/bin/rlsservice u:object_r:rlsservice_exec:s0 /vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0 /vendor/bin/storageproxyd u:object_r:tee_exec:s0 /vendor/bin/trusty_apploader u:object_r:trusty_apploader_exec:s0 diff --git a/vendor/hal_camera_default.te b/vendor/hal_camera_default.te index 2ddbeb6f..af60b9aa 100644 --- a/vendor/hal_camera_default.te +++ b/vendor/hal_camera_default.te @@ -43,10 +43,6 @@ userdebug_or_eng(` set_prop(hal_camera_default, vendor_camera_debug_prop); ') -# For camera hal to talk with rlsservice -allow hal_camera_default rls_service:service_manager find; -binder_call(hal_camera_default, rlsservice) - hal_client_domain(hal_camera_default, hal_graphics_allocator); hal_client_domain(hal_camera_default, hal_graphics_composer) hal_client_domain(hal_camera_default, hal_power); @@ -80,10 +76,6 @@ binder_call(hal_camera_default, hal_radioext_default); # Allows camera HAL to access the hw_jpeg /dev/video12. allow hal_camera_default hw_jpg_device:chr_file rw_file_perms; -# For camera hal to talk with rlsservice -allow hal_camera_default rls_service:service_manager find; -binder_call(hal_camera_default, rlsservice) - # Allow access to always-on compute device node allow hal_camera_default aoc_device:chr_file rw_file_perms; diff --git a/vendor/rlsservice.te b/vendor/rlsservice.te deleted file mode 100644 index 186471a7..00000000 --- a/vendor/rlsservice.te +++ /dev/null @@ -1,32 +0,0 @@ -type rlsservice, domain; -type rlsservice_exec, exec_type, vendor_file_type, file_type; - -init_daemon_domain(rlsservice) -vndbinder_use(rlsservice) -add_service(rlsservice, rls_service) - -# access rainbow sensor calibration files -allow rlsservice persist_file:dir search; -allow rlsservice persist_camera_file:dir search; -allow rlsservice persist_camera_file:file r_file_perms; -allow rlsservice mnt_vendor_file:dir search; - -# access device files -allow rlsservice rls_device:chr_file rw_file_perms; - -binder_call(rlsservice, hal_camera_default) - -# Allow access to display backlight information -allow rlsservice sysfs_leds:dir search; -allow rlsservice sysfs_leds:file r_file_perms; - -# Allow access to always-on compute device node -allow rlsservice device:dir r_file_perms; -allow rlsservice aoc_device:chr_file rw_file_perms; - -# For observing apex file changes -allow rlsservice apex_info_file:file r_file_perms; - -# Allow read camera property -get_prop(rlsservice, vendor_camera_prop); -