From 3c494301c8bd463b38ac5006d638a790ece79f68 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 7 Mar 2023 12:35:16 +0800 Subject: [PATCH] Move display dump to gs-common Bug: 269212897 Test: adb bugreport Change-Id: I8d2d0413987629bd3774034a5f99f5b7feb4b3ba --- whitechapel_pro/file.te | 2 -- whitechapel_pro/file_contexts | 1 - whitechapel_pro/genfs_contexts | 1 - whitechapel_pro/hal_dumpstate_default.te | 12 ------------ whitechapel_pro/vndservice.te | 1 - whitechapel_pro/vndservice_contexts | 1 - 6 files changed, 18 deletions(-) diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index 3a0f932a..5b5b82e1 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -1,7 +1,6 @@ # Data type rild_vendor_data_file, file_type, data_file_type; type vendor_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 modem_stat_data_file, file_type, data_file_type; type vendor_slog_file, file_type, data_file_type; @@ -60,7 +59,6 @@ type vendor_usb_debugfs, fs_type, debugfs_type; type vendor_charger_debugfs, fs_type, debugfs_type; type vendor_votable_debugfs, fs_type, debugfs_type; type vendor_battery_debugfs, fs_type, debugfs_type; -type vendor_dri_debugfs, fs_type, debugfs_type; type vendor_cma_debugfs, fs_type, debugfs_type; # vendor extra images diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index 36ccdc92..87fc1d94 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -196,7 +196,6 @@ /data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 /data/vendor/modem_stat(/.*)? u:object_r:modem_stat_data_file:s0 /data/vendor/log(/.*)? u:object_r:vendor_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/rild(/.*)? u:object_r:rild_vendor_data_file:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 diff --git a/whitechapel_pro/genfs_contexts b/whitechapel_pro/genfs_contexts index dc1f8836..a7c8a48a 100644 --- a/whitechapel_pro/genfs_contexts +++ b/whitechapel_pro/genfs_contexts @@ -198,7 +198,6 @@ genfscon debugfs /max77759_chg u:object genfscon debugfs /max77729_pmic u:object_r:vendor_charger_debugfs:s0 genfscon debugfs /gvotables u:object_r:vendor_votable_debugfs:s0 genfscon debugfs /google_battery u:object_r:vendor_battery_debugfs:s0 -genfscon debugfs /dri/0/crtc- u:object_r:vendor_dri_debugfs:s0 genfscon debugfs /cma u:object_r:vendor_cma_debugfs:s0 # Battery diff --git a/whitechapel_pro/hal_dumpstate_default.te b/whitechapel_pro/hal_dumpstate_default.te index 8dfe7cb7..fccaed7f 100644 --- a/whitechapel_pro/hal_dumpstate_default.te +++ b/whitechapel_pro/hal_dumpstate_default.te @@ -3,9 +3,6 @@ allow hal_dumpstate_default vendor_camera_data_file:file r_file_perms; allow hal_dumpstate_default sysfs_cpu:file r_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; - allow hal_dumpstate_default vendor_gps_file:dir r_dir_perms; allow hal_dumpstate_default vendor_gps_file:file r_file_perms; @@ -52,11 +49,6 @@ allow hal_dumpstate_default logbuffer_device:chr_file r_file_perms; allow hal_dumpstate_default proc_f2fs:dir r_dir_perms; allow hal_dumpstate_default proc_f2fs:file r_file_perms; -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; - vndbinder_use(hal_dumpstate_default) allow hal_dumpstate_default shell_data_file:file getattr; @@ -92,8 +84,6 @@ userdebug_or_eng(` allow hal_dumpstate_default vendor_maxfg_debugfs:dir r_dir_perms; allow hal_dumpstate_default vendor_maxfg_debugfs:file r_file_perms; allow hal_dumpstate_default vendor_pm_genpd_debugfs:file r_file_perms; - allow hal_dumpstate_default vendor_dri_debugfs:dir r_dir_perms; - allow hal_dumpstate_default vendor_dri_debugfs:file r_file_perms; allow hal_dumpstate_default debugfs_tracing_instances:dir search; allow hal_dumpstate_default debugfs_tracing_instances:file r_file_perms; allow hal_dumpstate_default sysfs_vendor_metrics:dir search; @@ -107,8 +97,6 @@ userdebug_or_eng(` ') dontaudit hal_dumpstate_default mnt_vendor_file:dir search; -dontaudit hal_dumpstate_default vendor_dri_debugfs:dir r_dir_perms; -dontaudit hal_dumpstate_default vendor_dri_debugfs:file r_file_perms; dontaudit hal_dumpstate_default debugfs:dir r_dir_perms; dontaudit hal_dumpstate_default vendor_votable_debugfs:dir r_dir_perms; dontaudit hal_dumpstate_default vendor_votable_debugfs:file r_file_perms; diff --git a/whitechapel_pro/vndservice.te b/whitechapel_pro/vndservice.te index 7f116c48..bd59e836 100644 --- a/whitechapel_pro/vndservice.te +++ b/whitechapel_pro/vndservice.te @@ -1,4 +1,3 @@ type rls_service, vndservice_manager_type; -type vendor_displaycolor_service, vndservice_manager_type; type vendor_surfaceflinger_vndservice, vndservice_manager_type; type eco_service, vndservice_manager_type; diff --git a/whitechapel_pro/vndservice_contexts b/whitechapel_pro/vndservice_contexts index e7fb4338..16ae43a4 100644 --- a/whitechapel_pro/vndservice_contexts +++ b/whitechapel_pro/vndservice_contexts @@ -1,4 +1,3 @@ rlsservice u:object_r:rls_service:s0 -displaycolor u:object_r:vendor_displaycolor_service:s0 Exynos.HWCService u:object_r:vendor_surfaceflinger_vndservice:s0 media.ecoservice u:object_r:eco_service:s0