From da91eed387356c29ecff7be4ea7e1aaf4efb92b8 Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Fri, 5 Jan 2024 02:57:09 +0000 Subject: [PATCH] gs101: move mediacodec_samsung sepolicy to gs-common remove mediacodec_samsung sepolicy in legacy path since we will include it from gs-common. Bug: 318793681 Test: build pass, camera record, youtube Change-Id: Idc0e19348d1e113e95305279aebbbaf82c79d730 --- whitechapel/vendor/google/file.te | 4 ---- whitechapel/vendor/google/file_contexts | 2 -- whitechapel/vendor/google/genfs_contexts | 3 --- whitechapel/vendor/google/hal_camera_default.te | 2 +- whitechapel/vendor/google/mediacodec.te | 10 ---------- whitechapel/vendor/google/property.te | 1 - whitechapel/vendor/google/property_contexts | 5 ----- whitechapel/vendor/google/vndservice.te | 1 - whitechapel/vendor/google/vndservice_contexts | 1 - 9 files changed, 1 insertion(+), 28 deletions(-) diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te index 965c876e..9e7f1fab 100644 --- a/whitechapel/vendor/google/file.te +++ b/whitechapel/vendor/google/file.te @@ -1,7 +1,6 @@ # Exynos Data Files #type vendor_data_file, file_type, data_file_type; type vendor_cbd_boot_file, file_type, data_file_type; -type vendor_media_data_file, file_type, data_file_type; # Exynos Log Files type vendor_log_file, file_type, data_file_type; @@ -134,9 +133,6 @@ type sysfs_memory, sysfs_type, fs_type; # bcmdhd (Broadcom FullMAC wireless cards support) type sysfs_bcmdhd, sysfs_type, fs_type; -# Video -type sysfs_video, sysfs_type, fs_type; - # UWB vendor type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type; type persist_uwb_file, file_type, vendor_persist_type; diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts index 7c3b828d..0d3d8a2f 100644 --- a/whitechapel/vendor/google/file_contexts +++ b/whitechapel/vendor/google/file_contexts @@ -224,9 +224,7 @@ /dev/lwis-votf u:object_r:lwis_device:s0 # VIDEO -/vendor/bin/hw/samsung\.hardware\.media\.c2@1\.0-service u:object_r:mediacodec_exec:s0 /vendor/bin/hw/google\.hardware\.media\.c2@1\.0-service u:object_r:mediacodec_exec:s0 -/data/vendor/media(/.*)? u:object_r:vendor_media_data_file:s0 # IMS VoWiFi /data/vendor/misc(/.*)? u:object_r:vendor_misc_data_file:s0 diff --git a/whitechapel/vendor/google/genfs_contexts b/whitechapel/vendor/google/genfs_contexts index 95852d7b..2adf1f01 100644 --- a/whitechapel/vendor/google/genfs_contexts +++ b/whitechapel/vendor/google/genfs_contexts @@ -308,9 +308,6 @@ genfscon sysfs /devices/platform/debugcore/sscoredump/sscd_debugcore/report_coun genfscon sysfs /devices/platform/mfc-core/sscoredump/sscd_mfc-core/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0 genfscon sysfs /devices/platform/wlan/sscoredump/sscd_wlan/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0 -# mediacodec -genfscon sysfs /devices/platform/mfc/video4linux/video u:object_r:sysfs_video:s0 - # SJTAG genfscon sysfs /devices/platform/sjtag_ap/interface u:object_r:sysfs_sjtag:s0 genfscon sysfs /devices/platform/sjtag_gsa/interface u:object_r:sysfs_sjtag:s0 diff --git a/whitechapel/vendor/google/hal_camera_default.te b/whitechapel/vendor/google/hal_camera_default.te index 07789692..8e0a8616 100644 --- a/whitechapel/vendor/google/hal_camera_default.te +++ b/whitechapel/vendor/google/hal_camera_default.te @@ -72,7 +72,7 @@ binder_call(hal_camera_default, system_server); # Allow Binder calls to ECO service, needed by Entropy-Aware Filtering allow hal_camera_default eco_service:service_manager find; -binder_call(hal_camera_default, mediacodec); +binder_call(hal_camera_default, mediacodec_samsung); # Allow camera HAL to query preferred camera frequencies from the radio HAL # extensions to avoid interference with cellular antennas. diff --git a/whitechapel/vendor/google/mediacodec.te b/whitechapel/vendor/google/mediacodec.te index 0c22d5bf..13d8ab85 100644 --- a/whitechapel/vendor/google/mediacodec.te +++ b/whitechapel/vendor/google/mediacodec.te @@ -1,11 +1 @@ -userdebug_or_eng(` - set_prop(mediacodec, vendor_codec2_debug_prop) - allow mediacodec vendor_media_data_file:dir rw_dir_perms; - allow mediacodec vendor_media_data_file:file create_file_perms; -') - -add_service(mediacodec, eco_service) -allow mediacodec hal_camera_default:binder call; -allow mediacodec sysfs_video:file r_file_perms; -allow mediacodec sysfs_video:dir r_dir_perms; allow mediacodec dmabuf_system_secure_heap_device:chr_file r_file_perms; diff --git a/whitechapel/vendor/google/property.te b/whitechapel/vendor/google/property.te index 934e13a9..98da3e39 100644 --- a/whitechapel/vendor/google/property.te +++ b/whitechapel/vendor/google/property.te @@ -14,7 +14,6 @@ vendor_internal_prop(vendor_persist_config_default_prop) vendor_internal_prop(vendor_sys_default_prop) vendor_internal_prop(vendor_ro_sys_default_prop) vendor_internal_prop(vendor_persist_sys_default_prop) -vendor_internal_prop(vendor_codec2_debug_prop) vendor_internal_prop(vendor_display_prop) vendor_internal_prop(vendor_camera_prop) vendor_internal_prop(vendor_camera_fatp_prop) diff --git a/whitechapel/vendor/google/property_contexts b/whitechapel/vendor/google/property_contexts index 4c01239d..c9187a3f 100644 --- a/whitechapel/vendor/google/property_contexts +++ b/whitechapel/vendor/google/property_contexts @@ -15,11 +15,6 @@ persist.vendor.sys.crash_rcu u:object_r:vendor_ramdump_prop:s0 vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 persist.vendor.sys.ssr. u:object_r:vendor_ssrdump_prop:s0 -# for codec2 -vendor.debug.c2.level u:object_r:vendor_codec2_debug_prop:s0 -vendor.debug.c2.dump u:object_r:vendor_codec2_debug_prop:s0 -vendor.debug.c2.dump.opt u:object_r:vendor_codec2_debug_prop:s0 - # USB HAL persist.vendor.usb. u:object_r:vendor_usb_config_prop:s0 vendor.usb. u:object_r:vendor_usb_config_prop:s0 diff --git a/whitechapel/vendor/google/vndservice.te b/whitechapel/vendor/google/vndservice.te index 06ef0b2d..12a48194 100644 --- a/whitechapel/vendor/google/vndservice.te +++ b/whitechapel/vendor/google/vndservice.te @@ -1,2 +1 @@ type vendor_surfaceflinger_vndservice, vndservice_manager_type; -type eco_service, vndservice_manager_type; diff --git a/whitechapel/vendor/google/vndservice_contexts b/whitechapel/vendor/google/vndservice_contexts index 6ddcabfe..4f9f5a70 100644 --- a/whitechapel/vendor/google/vndservice_contexts +++ b/whitechapel/vendor/google/vndservice_contexts @@ -1,2 +1 @@ Exynos.HWCService u:object_r:vendor_surfaceflinger_vndservice:s0 -media.ecoservice u:object_r:eco_service:s0