From 0a6a3e1f898fe40b3f2275e5281b723bf5fc18a5 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 18 Nov 2022 13:07:27 +0800 Subject: [PATCH] include focaltech setting from gs-common Bug: 256521567 Test: adb bugreport Change-Id: Ic57d0f0e32afbc8b706f60004509f38e7855c032 --- conf/init.pantah.rc | 21 --------------------- conf/init.panther.rc | 7 ------- device-panther.mk | 1 + 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 6ecb93d..b6517f6 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -87,27 +87,6 @@ on property:ro.boot.hardware.revision=PROTO1.0 on property:ro.boot.hardware.revision=PROTO1.1 setprop vendor.thermal.config "thermal_info_config_proto.json" -# Touch -on property:vendor.device.modules.ready=1 - chown system system /proc/focaltech_touch/Channel_Num - chown system system /proc/focaltech_touch/FW_Version - chown system system /proc/focaltech_touch/INT_PIN - chown system system /proc/focaltech_touch/force_active - chown system system /proc/focaltech_touch/Reset_Pin - chown system system /proc/focaltech_touch/fw_grip - chown system system /proc/focaltech_touch/fw_palm - chown system system /proc/focaltech_touch/heatmap_onoff - chown system system /proc/focaltech_touch/mf_mode - chown system system /proc/focaltech_touch/selftest/Baseline - chown system system /proc/focaltech_touch/selftest/Noise - chown system system /proc/focaltech_touch/selftest/Panel_Differ - chown system system /proc/focaltech_touch/selftest/Rawdata - chown system system /proc/focaltech_touch/selftest/Rawdata_Uniformity - chown system system /proc/focaltech_touch/selftest/Scap_CB - chown system system /proc/focaltech_touch/selftest/Scap_Rawdata - chown system system /proc/focaltech_touch/selftest/Short - chown system system /proc/focaltech_touch/selftest/Strength - # Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints on property:sys.boot_completed=1 trigger override-sf-uclamp diff --git a/conf/init.panther.rc b/conf/init.panther.rc index d786cf3..2e78ee9 100644 --- a/conf/init.panther.rc +++ b/conf/init.panther.rc @@ -6,13 +6,6 @@ on property:vendor.device.modules.ready=1 # Start the twoshay touch service start twoshay -# Toggle glove_mode according to touch_sensitivity_mode -on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 - write /proc/focaltech_touch/high_sensitivity 0 - -on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1 - write /proc/focaltech_touch/high_sensitivity 1 - # For Japan sku, always enforce camera shutter sound # Since this property is read by the audio server in system service, # it should be written by the system init. diff --git a/device-panther.mk b/device-panther.mk index f38a7ea..ea9f44d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -30,6 +30,7 @@ include device/google/pantah/audio/panther/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/focaltech/focaltech.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,panther)