sm8450-common: Kill touch_report for good

Change-Id: I455ac88ab2fe0aa3616464f0689d651a7508f4f1

common.mk

@@ -405,8 +405,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/etc/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.qcom.rc \
     $(LOCAL_PATH)/rootdir/etc/init.qti.kernel.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.qti.kernel.rc \
     $(LOCAL_PATH)/rootdir/etc/init.target.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.target.rc \
-    $(LOCAL_PATH)/rootdir/etc/init.touch_report.rc:$(TARGET_COPY_OUT_RECOVERY)/root/vendor/etc/init/init.touch_report.rc \
-    $(LOCAL_PATH)/rootdir/etc/init.touch_report.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.touch_report.rc \
     $(LOCAL_PATH)/rootdir/etc/init.xiaomi_sm8450.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.xiaomi_sm8450.rc \
 
 PRODUCT_COPY_FILES += \

rootdir/etc/init.touch_report.rc

@@ -1,123 +0,0 @@
-# Copyright (c) 2017-2022 Xiaomi, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Xiaomi, Inc.
-#
-
-on post-fs-data
-    mkdir /data/vendor/mqsas_common 0771 system system
-    mkdir /data/vendor/touch 0771 system system
-
-on boot
-    chown system system /dev/xiaomi-touch
-    chmod 0664 /dev/xiaomi-touch
-    chown system system /dev/xiaomi-touch-knock
-    chmod 0664 /dev/xiaomi-touch-knock
-    chown system system /dev/xiaomi-thp
-    chmod 0664 /dev/xiaomi-thp
-    chown system system /sys/class/touch/tp_dev/fod_status
-    chmod 0664 /sys/class/touch/tp_dev/fod_status
-    chown system system /sys/class/touch/touch_dev/gesture_single_tap_state
-    chmod 0664 /sys/class/touch/touch_dev/gesture_single_tap_state
-    chown system system /sys/class/touch/touch_dev/fod_press_status
-    chmod 0664 /sys/class/touch/touch_dev/fod_press_status
-    chown system system /proc/tp_selftest
-    chmod 0664 /proc/tp_selftest
-    chown system system /proc/tp_selftest_1
-    chmod 0664 /proc/tp_selftest_1
-    chown system system /sys/class/touch/touch_dev/clicktouch_raw
-    chmod 0664 /sys/class/touch/touch_dev/clicktouch_raw
-    chown system system /sys/class/touch/touch_dev/update_rawdata
-    chmod 0664 /sys/class/touch/touch_dev/update_rawdata
-    chown system system /sys/class/touch/touch_dev/enable_touch_raw
-    chmod 0664 /sys/class/touch/touch_dev/enable_touch_raw
-    chown system system /sys/class/touch/touch_dev/enable_touch_delta
-    chmod 0664 /sys/class/touch/touch_dev/enable_touch_delta
-    chown system system /sys/class/touch/touch_dev/touch_thp_dump
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_dump
-    chown system system /sys/class/touch/touch_dev/touch_thp_cmd
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_cmd
-    chown system system /sys/class/touch/touch_dev/suspend_state
-    chmod 0664 /sys/class/touch/touch_dev/suspend_state
-    chown system system /sys/class/touch/touch_dev/prox_sensor_data
-    chmod 0664 /sys/class/touch/touch_dev/prox_sensor_data
-    chown system system /sys/class/touch/touch_dev/prox_sensor
-    chmod 0664 /sys/class/touch/touch_dev/prox_sensor
-    chown system system /sys/class/touch/touch_dev/touch_thp_rx_num
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_rx_num
-    chown system system /sys/class/touch/touch_dev/touch_thp_tx_num
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_tx_num
-    chown system system /sys/class/touch/touch_dev/touch_thp_x_resolution
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_x_resolution
-    chown system system /sys/class/touch/touch_dev/touch_thp_y_resolution
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_y_resolution
-    chown system system /sys/class/touch/touch_dev/touch_thp_smooth
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_smooth
-    chown system system /sys/class/touch/touch_dev/touch_thp_noisefilter
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_noisefilter
-    chown system system /sys/class/touch/touch_dev/touch_thp_downthd
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_downthd
-    chown system system /sys/class/touch/touch_dev/touch_thp_upthd
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_upthd
-    chown system system /sys/class/touch/touch_dev/touch_thp_movethd
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_movethd
-    chown system system /sys/class/touch/touch_dev/touch_thp_islandthd
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_islandthd
-    chown system system /sys/class/touch/touch_dev/touch_thp_cmd_data
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_cmd_data
-    chown system system /sys/class/touch/touch_dev/palm_sensor_data
-    chmod 0664 /sys/class/touch/touch_dev/palm_sensor_data
-    chown system system /sys/class/touch/touch_dev/palm_sensor
-    chmod 0664 /sys/class/touch/touch_dev/palm_sensor
-    chown system system /sys/class/touch/touch_dev/hold_sensor
-    chmod 0664 /sys/class/touch/touch_dev/hold_sensor
-    chown system system /proc/tp_hal_version
-    chmod 0664 /proc/tp_hal_version
-    chown system system /proc/tp_lockdown_info
-    chmod 0664 /proc/tp_lockdown_info
-    chmod 0664 /sys/class/touch/touch_dev/touch_active_status
-    chown system system /sys/class/touch/touch_dev/touch_active_status
-    chmod 0664 /sys/class/touch/touch_dev/touch_finger_status
-    chown system system /sys/class/touch/touch_dev/touch_finger_status
-    chmod 0664 /sys/class/touch/touch_dev/touch_irq_no
-    chown system system /sys/class/touch/touch_dev/touch_irq_no
-    chmod 0664 /sys/class/touch/touch_dev/touch_sensor
-    chown system system /sys/class/touch/touch_dev/touch_sensor
-    chmod 0664 /sys/class/touch/touch_dev/touch_sensor_ctrl
-    chown system system /sys/class/touch/touch_dev/touch_sensor_ctrl
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_film
-    chown system system /sys/class/touch/touch_dev/touch_thp_film
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_mem_notify
-    chown system system /sys/class/touch/touch_dev/touch_thp_mem_notify
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_testmode
-    chown system system /sys/class/touch/touch_dev/touch_thp_testmode
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_testresult
-    chown system system /sys/class/touch/touch_dev/touch_thp_testresult
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_preset_point
-    chown system system /sys/class/touch/touch_dev/touch_thp_preset_point
-    chmod 0664 /sys/class/touch/touch_dev/touch_doze_analysis
-    chown system system /sys/class/touch/touch_dev/touch_doze_analysis
-    chown system system /sys/class/touch/touch_dev/touch_thp_cmd_ready
-    chmod 0664 /sys/class/touch/touch_dev/touch_thp_cmd_ready
-    chmod 0664 /sys/class/touch/touch_dev/touch_ic_buffer
-    chown system system /sys/class/touch/touch_dev/touch_ic_buffer
-    chmod 0664 /sys/class/touch/touch_dev/abnormal_event
-    chown system system /sys/class/touch/touch_dev/abnormal_event
-
-    chown system system /sys/class/touch/touch_dev/fod_longpress_gesture_enabled
-    chmod 0660 /sys/class/touch/touch_dev/fod_longpress_gesture_enabled
-
-    chown system system /sys/class/touch/touch_dev/gesture_single_tap_enabled
-    chmod 0660 /sys/class/touch/touch_dev/gesture_single_tap_enabled
-
-    chown system system /sys/class/touch/touch_dev/gesture_double_tap_enabled
-    chmod 0660 /sys/class/touch/touch_dev/gesture_double_tap_enabled
-    chown system system /sys/class/touch/touch_dev/gesture_double_tap_state
-    chmod 0664 /sys/class/touch/touch_dev/gesture_double_tap_state
-
-service touch_report /vendor/bin/touch_report
-    class hal
-    user system
-    group system uhid input
-    capabilities SYS_NICE
-    ioprio rt 4
-    seclabel u:r:touchreport:s0

rootdir/etc/init.xiaomi_sm8450.rc

@@ -48,6 +48,22 @@ on boot
     chown system system /dev/xiaomi-touch
     chmod 0660 /dev/xiaomi-touch
 
+    # Touchscreen sensors
+    chown system system /sys/class/touch/touch_dev/fod_longpress_gesture_enabled
+    chown system system /sys/class/touch/touch_dev/fod_press_status
+    chmod 0660 /sys/class/touch/touch_dev/fod_longpress_gesture_enabled
+    chmod 0660 /sys/class/touch/touch_dev/fod_press_status
+
+    chown system system /sys/class/touch/touch_dev/gesture_single_tap_enabled
+    chown system system /sys/class/touch/touch_dev/gesture_single_tap_state
+    chmod 0660 /sys/class/touch/touch_dev/gesture_single_tap_enabled
+    chmod 0660 /sys/class/touch/touch_dev/gesture_single_tap_state
+
+    chown system system /sys/class/touch/touch_dev/gesture_double_tap_enabled
+    chown system system /sys/class/touch/touch_dev/gesture_double_tap_state
+    chmod 0660 /sys/class/touch/touch_dev/gesture_double_tap_enabled
+    chmod 0660 /sys/class/touch/touch_dev/gesture_double_tap_state
+
 on post-fs-data
     # Create folder of camera
     mkdir /data/vendor/camera/offlinelog 0777 cameraserver audio

sepolicy/vendor/file.te

@@ -25,12 +25,3 @@ type vendor_mac_vendor_data_file, data_file_type, file_type, mlstrustedobject;
 type sys_thermal_wifi_limit, fs_type, sysfs_type;
 type sys_thermal_flash_state, fs_type, sysfs_type;
 type thermal_data_file, data_file_type, file_type;
-
-# Touchscreen
-type proc_tp_file, fs_type, proc_type;
-type proc_tp_lockdown, fs_type, proc_type;
-type sysfs_touch_hostprocess, fs_type, sysfs_type;
-type sysfs_touch_suspend, fs_type, sysfs_type;
-type sysfs_tp_fodstatus, fs_type, sysfs_type;
-type sysfs_tp_virtual_prox, fs_type, sysfs_type;
-type vendor_data_touchreport_file, data_file_type, file_type;

sepolicy/vendor/file_contexts

@@ -82,25 +82,4 @@
 /sys/devices/virtual/thermal/thermal_message/wifi_limit u:object_r:sys_thermal_wifi_limit:s0
 
 # Touchscreen
-/(vendor|system/vendor)/bin/touch_report u:object_r:touchreport_exec:s0
-/data/vendor/touch(/.*)? u:object_r:vendor_data_touchreport_file:s0
 /dev/xiaomi-touch u:object_r:touchfeature_device:s0
-/sys/devices/virtual/touch/touch_dev/abnormal_event u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/clicktouch_raw u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/ear_sensor u:object_r:sysfs_tp_virtual_prox:s0
-/sys/devices/virtual/touch/touch_dev/ear_sensor_data u:object_r:sysfs_tp_virtual_prox:s0
-/sys/devices/virtual/touch/touch_dev/enable_touch_delta u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/enable_touch_raw u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/force_calibration u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/hold_sensor u:object_r:sysfs_tp_virtual_prox:s0
-/sys/devices/virtual/touch/touch_dev/palm_sensor u:object_r:sysfs_tp_virtual_prox:s0
-/sys/devices/virtual/touch/touch_dev/rx_num u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/suspend_state u:object_r:sysfs_touch_suspend:s0
-/sys/devices/virtual/touch/touch_dev/touch_doze_analysis u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/touch_ic_buffer u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/touch_sensor u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/touch_sensor_ctrl u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/touch_thp_(.*) u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/tx_num u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/touch_dev/update_rawdata u:object_r:sysfs_touch_hostprocess:s0
-/sys/devices/virtual/touch/tp_dev/fod_status u:object_r:sysfs_tp_fodstatus:s0

sepolicy/vendor/genfs_contexts

@@ -8,6 +8,7 @@ genfscon sysfs /devices/platform/soc/soc:fingerprint_fpc u:object_r:vendor_sysfs
 
 # Sensors
 genfscon sysfs /devices/virtual/touch/touch_dev/fod_longpress_gesture_enabled u:object_r:vendor_sysfs_sensors:s0
+genfscon sysfs /devices/virtual/touch/touch_dev/fod_press_status u:object_r:vendor_sysfs_sensors:s0
 genfscon sysfs /devices/virtual/touch/touch_dev/gesture_double_tap_enabled u:object_r:vendor_sysfs_sensors:s0
 genfscon sysfs /devices/virtual/touch/touch_dev/gesture_double_tap_state u:object_r:vendor_sysfs_sensors:s0
 genfscon sysfs /devices/virtual/touch/touch_dev/gesture_single_tap_enabled u:object_r:vendor_sysfs_sensors:s0
@@ -24,42 +25,4 @@ genfscon sysfs /devices/platform/soc/soc:fingerprint_goodix/wakeup u:object_r:sy
 genfscon sysfs /devices/platform/soc/soc:fingerprint_fpc/wakeup/wakeup u:object_r:sysfs_wakeup:s0
 
 # Touchscreen
-genfscon proc /tp_hal_version u:object_r:proc_tp_file:s0
-genfscon proc /tp_lockdown_info u:object_r:proc_tp_lockdown:s0
 genfscon sysfs /devices/platform/goodix_ts.0/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/abnormal_event u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/clicktouch_raw u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/ear_sensor u:object_r:sysfs_tp_virtual_prox:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/ear_sensor_data u:object_r:sysfs_tp_virtual_prox:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/enable_touch_delta u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/enable_touch_raw u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/fod_press_status u:object_r:sysfs_tp_fodstatus:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/hold_sensor u:object_r:sysfs_tp_virtual_prox:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/palm_sensor u:object_r:sysfs_tp_virtual_prox:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/palm_sensor_data u:object_r:sysfs_tp_virtual_prox:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/suspend_state u:object_r:sysfs_touch_suspend:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_active_status u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_doze_analysis u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_finger_status u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_ic_buffer u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_irq_no u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_sensor_ctrl u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_cmd u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_cmd_ready u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_downthd u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_dump u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_dump_data u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_islandthd u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_mem_notify u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_movethd u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_noisefilter u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_preset_point u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_rx_num u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_smooth u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_testmode u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_testresult u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_tx_num u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_upthd u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_x_resolution u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/touch_thp_y_resolution u:object_r:sysfs_touch_hostprocess:s0
-genfscon sysfs /devices/virtual/touch/touch_dev/update_rawdata u:object_r:sysfs_touch_hostprocess:s0

sepolicy/vendor/hal_fingerprint.te

@@ -3,8 +3,8 @@ type vendor_hal_fingerprint_hwservice_xiaomi, hwservice_manager_type;
 allow hal_fingerprint_default input_device:chr_file rw_file_perms;
 allow hal_fingerprint_default input_device:dir r_dir_perms;
 allow hal_fingerprint_default self:netlink_socket create_socket_perms_no_ioctl;
-allow hal_fingerprint_default sysfs_tp_fodstatus:chr_file r_file_perms;
-allow hal_fingerprint_default sysfs_tp_fodstatus:file r_file_perms;
+allow hal_fingerprint_default vendor_sysfs_sensors:chr_file r_file_perms;
+allow hal_fingerprint_default vendor_sysfs_sensors:file r_file_perms;
 allow hal_fingerprint_default tee_device:chr_file rw_file_perms;
 allow hal_fingerprint_default touchfeature_device:chr_file rw_file_perms;
 allow hal_fingerprint_default uhid_device:chr_file rw_file_perms;

sepolicy/vendor/hal_sensors.te

@@ -4,5 +4,3 @@ allow hal_sensors_default sound_device:chr_file rw_file_perms;
 allow hal_sensors_default vendor_sysfs_graphics:dir r_dir_perms;
 allow hal_sensors_default vendor_sysfs_graphics:file r_file_perms;
 allow hal_sensors_default stmvl53l5_device:chr_file { ioctl open read write };
-allow hal_sensors_default sysfs_tp_fodstatus:file r_file_perms;
-allow hal_sensors_default sysfs_tp_virtual_prox:file rw_file_perms;

sepolicy/vendor/touchreport.te

@@ -1,35 +0,0 @@
-type touchreport, domain;
-type touchreport_exec, exec_type, file_type, vendor_file_type;
-
-init_daemon_domain(touchreport)
-
-allow touchreport input_device:chr_file rw_file_perms;
-allow touchreport input_device:dir r_dir_perms;
-allow touchreport proc_tp_file:file { open read write };
-allow touchreport proc_tp_lockdown:file { open read write };
-allow touchreport self:cap_userns sys_nice;
-allow touchreport self:capability sys_nice;
-allow touchreport self:tcp_socket { create getattr getopt read setopt write };
-allow touchreport self:udp_socket { create getattr getopt read setopt write };
-allow touchreport sysfs_touch_hostprocess:file rw_file_perms;
-allow touchreport sysfs_touch_hostprocess:file { open read write };
-allow touchreport sysfs_touch_suspend:file rw_file_perms;
-allow touchreport sysfs_touch_suspend:file { open read write };
-allow touchreport sysfs_tp_virtual_prox:file rw_file_perms;
-allow touchreport sysfs_tp_virtual_prox:file { open read write };
-allow touchreport touchfeature_device:chr_file rw_file_perms;
-allow touchreport touchfeature_device:file { getattr map read };
-allow touchreport touchreport_exec:file entrypoint;
-allow touchreport uhid_device:chr_file rw_file_perms;
-allow touchreport vendor_data_touchreport_file:dir { add_name read remove_name search watch write };
-allow touchreport vendor_data_touchreport_file:file { create getattr open read rename setattr unlink write };
-allow touchreport vendor_firmware_file:dir r_dir_perms;
-allow touchreport vendor_firmware_file:dir search;
-allow touchreport vendor_firmware_file:file r_file_perms;
-allow touchreport vendor_sysfs_graphics:file { open read };
-
-recovery_only(`
-userdebug_or_eng(`
-permissive touchreport;
-')
-')