From 7d3f25d95bc8e7e6857ccee3e63991d23e7f6962 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 7 Mar 2023 13:01:05 +0800 Subject: [PATCH] Move display dump to gs-common Bug: 269212897 Test: adb bugreport Change-Id: Id40661687bbd04d7eba4790dc5fe17ca5c79e47d --- whitechapel/vendor/google/file.te | 2 -- whitechapel/vendor/google/file_contexts | 1 - whitechapel/vendor/google/genfs_contexts | 1 - whitechapel/vendor/google/hal_dumpstate_default.te | 14 -------------- whitechapel/vendor/google/vndservice.te | 1 - whitechapel/vendor/google/vndservice_contexts | 1 - 6 files changed, 20 deletions(-) diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te index e20541cc..b6248205 100644 --- a/whitechapel/vendor/google/file.te +++ b/whitechapel/vendor/google/file.te @@ -7,7 +7,6 @@ type vendor_media_data_file, file_type, data_file_type; type vendor_log_file, file_type, data_file_type; type vendor_cbd_log_file, file_type, data_file_type; type vendor_dmd_log_file, file_type, data_file_type; -type vendor_hwc_log_file, file_type, data_file_type; type vendor_rfsd_log_file, file_type, data_file_type; type vendor_dump_log_file, file_type, data_file_type; type vendor_rild_log_file, file_type, data_file_type; @@ -24,7 +23,6 @@ type vendor_rpmbmock_data_file, file_type, data_file_type; # Exynos debugfs type vendor_ion_debugfs, fs_type, debugfs_type; type vendor_mali_debugfs, fs_type, debugfs_type; -type vendor_dri_debugfs, fs_type, debugfs_type; type vendor_pm_genpd_debugfs, fs_type, debugfs_type; type vendor_regmap_debugfs, fs_type, debugfs_type; type vendor_usb_debugfs, fs_type, debugfs_type; diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts index c2e8117a..aa0f2f78 100644 --- a/whitechapel/vendor/google/file_contexts +++ b/whitechapel/vendor/google/file_contexts @@ -143,7 +143,6 @@ /data/vendor/log(/.*)? u:object_r:vendor_log_file:s0 /data/vendor/log/cbd(/.*)? u:object_r:vendor_cbd_log_file:s0 /data/vendor/log/dmd(/.*)? u:object_r:vendor_dmd_log_file:s0 -/data/vendor/log/hwc(/.*)? u:object_r:vendor_hwc_log_file:s0 /data/vendor/log/rfsd(/.*)? u:object_r:vendor_rfsd_log_file:s0 /data/vendor/log/dump(/.*)? u:object_r:vendor_dump_log_file:s0 /data/vendor/log/rild(/.*)? u:object_r:vendor_rild_log_file:s0 diff --git a/whitechapel/vendor/google/genfs_contexts b/whitechapel/vendor/google/genfs_contexts index 78ca2633..1c6c211e 100644 --- a/whitechapel/vendor/google/genfs_contexts +++ b/whitechapel/vendor/google/genfs_contexts @@ -670,7 +670,6 @@ genfscon sysfs /devices/platform/14520000.pcie/power_stats genfscon debugfs /maxfg u:object_r:vendor_maxfg_debugfs:s0 genfscon debugfs /maxfg_base u:object_r:vendor_maxfg_debugfs:s0 genfscon debugfs /maxfg_flip u:object_r:vendor_maxfg_debugfs:s0 -genfscon debugfs /dri/0/crtc- u:object_r:vendor_dri_debugfs:s0 genfscon debugfs /ion u:object_r:vendor_ion_debugfs:s0 genfscon debugfs /pm_genpd/pm_genpd_summary u:object_r:vendor_pm_genpd_debugfs:s0 genfscon debugfs /regmap u:object_r:vendor_regmap_debugfs:s0 diff --git a/whitechapel/vendor/google/hal_dumpstate_default.te b/whitechapel/vendor/google/hal_dumpstate_default.te index be51f49a..86e5f6de 100644 --- a/whitechapel/vendor/google/hal_dumpstate_default.te +++ b/whitechapel/vendor/google/hal_dumpstate_default.te @@ -22,9 +22,6 @@ allow hal_dumpstate_default shell_data_file:file getattr; allow hal_dumpstate_default radio_vendor_data_file:dir create_dir_perms; allow hal_dumpstate_default radio_vendor_data_file:file create_file_perms; -allow hal_dumpstate_default vendor_hwc_log_file:dir r_dir_perms; -allow hal_dumpstate_default vendor_hwc_log_file:file r_file_perms; - # camera debugging dump file access allow hal_dumpstate_default vendor_camera_data_file:dir r_dir_perms; allow hal_dumpstate_default vendor_camera_data_file:file r_file_perms; @@ -64,11 +61,6 @@ allow hal_dumpstate_default sysfs_batteryinfo:file r_file_perms; allow hal_dumpstate_default vendor_toolbox_exec:file execute_no_trans; allow hal_dumpstate_default vendor_shell_exec:file execute_no_trans; -allow hal_dumpstate_default vendor_displaycolor_service:service_manager find; -binder_call(hal_dumpstate_default, hal_graphics_composer_default); -allow hal_dumpstate_default sysfs_display:dir r_dir_perms; -allow hal_dumpstate_default sysfs_display:file r_file_perms; - allow hal_dumpstate_default proc_vendor_sched:file read; allow hal_dumpstate_default proc_vendor_sched:dir r_dir_perms; allow hal_dumpstate_default proc_vendor_sched:file r_file_perms; @@ -89,9 +81,6 @@ userdebug_or_eng(` allow hal_dumpstate_default sysfs_pixel_stat:dir r_dir_perms; allow hal_dumpstate_default sysfs_pixel_stat:file r_file_perms; - allow hal_dumpstate_default vendor_dri_debugfs:file r_file_perms; - allow hal_dumpstate_default vendor_dri_debugfs:dir search; - allow hal_dumpstate_default vendor_pm_genpd_debugfs:file r_file_perms; allow hal_dumpstate_default vendor_usb_debugfs:dir r_dir_perms; @@ -134,9 +123,6 @@ dontaudit hal_dumpstate_default sysfs_pixel_stat:file r_file_perms; dontaudit hal_dumpstate_default sysfs_vendor_metrics:dir search; dontaudit hal_dumpstate_default sysfs_vendor_metrics:file r_file_perms; -dontaudit hal_dumpstate_default vendor_dri_debugfs:file r_file_perms; -dontaudit hal_dumpstate_default vendor_dri_debugfs:dir search; - dontaudit hal_dumpstate_default vendor_pm_genpd_debugfs:file r_file_perms; dontaudit hal_dumpstate_default vendor_usb_debugfs:dir r_dir_perms; diff --git a/whitechapel/vendor/google/vndservice.te b/whitechapel/vendor/google/vndservice.te index f70a26fe..bd59e836 100644 --- a/whitechapel/vendor/google/vndservice.te +++ b/whitechapel/vendor/google/vndservice.te @@ -1,4 +1,3 @@ type rls_service, vndservice_manager_type; type vendor_surfaceflinger_vndservice, vndservice_manager_type; -type vendor_displaycolor_service, vndservice_manager_type; type eco_service, vndservice_manager_type; diff --git a/whitechapel/vendor/google/vndservice_contexts b/whitechapel/vendor/google/vndservice_contexts index d44e1cb8..d272fe16 100644 --- a/whitechapel/vendor/google/vndservice_contexts +++ b/whitechapel/vendor/google/vndservice_contexts @@ -1,4 +1,3 @@ Exynos.HWCService u:object_r:vendor_surfaceflinger_vndservice:s0 rlsservice u:object_r:rls_service:s0 -displaycolor u:object_r:vendor_displaycolor_service:s0 media.ecoservice u:object_r:eco_service:s0