From 35492ad70f7d446954ec4c5d30215e9150d18edf Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 28 Nov 2022 14:08:51 +0800 Subject: [PATCH] use touch dump from gs-common Bug: 256521567 Test: adb bugreport Change-Id: I02a5831e6282eb431f2cbf89941ef188e801bd09 --- whitechapel/vendor/google/file.te | 4 ---- whitechapel/vendor/google/genfs_contexts | 17 ----------------- .../vendor/google/hal_dumpstate_default.te | 6 ------ 3 files changed, 27 deletions(-) diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te index 0aa0ec1b..d76960c8 100644 --- a/whitechapel/vendor/google/file.te +++ b/whitechapel/vendor/google/file.te @@ -84,10 +84,6 @@ type bootdevice_sysdev, dev_type; # ZRam type per_boot_file, file_type, data_file_type, core_data_file_type; -# Touch -type proc_touch, proc_type, fs_type, mlstrustedobject; -type sysfs_touch, sysfs_type, fs_type; - # RILD type rild_vendor_data_file, file_type, data_file_type; diff --git a/whitechapel/vendor/google/genfs_contexts b/whitechapel/vendor/google/genfs_contexts index 26151e91..72ba7811 100644 --- a/whitechapel/vendor/google/genfs_contexts +++ b/whitechapel/vendor/google/genfs_contexts @@ -347,23 +347,6 @@ genfscon sysfs /devices/platform/gpio_keys/wakeup genfscon sysfs /devices/platform/odm/odm:btbcm/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/sound-aoc/wakeup u:object_r:sysfs_wakeup:s0 -# Touch -genfscon sysfs /devices/platform/10d40000.spi/spi_master/spi11/spi11.0 u:object_r:sysfs_touch:s0 -genfscon sysfs /devices/platform/10950000.spi/spi_master/spi6/spi6.0 u:object_r:sysfs_touch:s0 -genfscon proc /fts/driver_test u:object_r:proc_touch:s0 -genfscon proc /fts_ext/driver_test u:object_r:proc_touch:s0 -genfscon sysfs /devices/virtual/input/input2 u:object_r:sysfs_touch:s0 -genfscon sysfs /devices/virtual/input/input3 u:object_r:sysfs_touch:s0 -genfscon sysfs /devices/virtual/input/nvt_touch u:object_r:sysfs_touch:s0 -genfscon proc /nvt_baseline u:object_r:proc_touch:s0 -genfscon proc /nvt_cc_uniformity u:object_r:proc_touch:s0 -genfscon proc /nvt_diff u:object_r:proc_touch:s0 -genfscon proc /nvt_fw_version u:object_r:proc_touch:s0 -genfscon proc /nvt_heatmap u:object_r:proc_touch:s0 -genfscon proc /nvt_pen_diff u:object_r:proc_touch:s0 -genfscon proc /nvt_raw u:object_r:proc_touch:s0 -genfscon proc /nvt_selftest u:object_r:proc_touch:s0 - # Input genfscon sysfs /devices/platform/11110000.usb/11110000.dwc3/xhci-hcd-exynos.4.auto/usb2/2-1 u:object_r:sysfs_uhid:s0 genfscon sysfs /devices/platform/11110000.usb/11110000.dwc3/xhci-hcd-exynos.5.auto/usb2/2-1 u:object_r:sysfs_uhid:s0 diff --git a/whitechapel/vendor/google/hal_dumpstate_default.te b/whitechapel/vendor/google/hal_dumpstate_default.te index d3cbd6d6..10f9b38a 100644 --- a/whitechapel/vendor/google/hal_dumpstate_default.te +++ b/whitechapel/vendor/google/hal_dumpstate_default.te @@ -46,11 +46,6 @@ allow hal_dumpstate_default logbuffer_device:chr_file r_file_perms; allow hal_dumpstate_default sysfs_wifi:dir search; allow hal_dumpstate_default sysfs_wifi:file r_file_perms; -# Touch sysfs interface -allow hal_dumpstate_default sysfs_touch:dir r_dir_perms; -allow hal_dumpstate_default sysfs_touch:file rw_file_perms; -allow hal_dumpstate_default proc_touch:file rw_file_perms; - # Modem logs allow hal_dumpstate_default modem_efs_file:dir search; allow hal_dumpstate_default modem_efs_file:file r_file_perms; @@ -60,7 +55,6 @@ allow hal_dumpstate_default block_device:dir r_dir_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 proc_touch:file rw_file_perms; allow hal_dumpstate_default sysfs_batteryinfo:dir search; allow hal_dumpstate_default sysfs_batteryinfo:dir r_dir_perms;