From e29895f7901c589e6914c1eb01c84789f13ccee4 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 9 Mar 2021 21:37:13 -0800 Subject: [PATCH 1/2] Add AOSP support for Raven and Oriole. We will have a 'vendor' project containing proprietary blobs to be able to build and flash Pixel device when vendor source is not available. The project names are platform/vendor/aosp/google_devices/raven platform/vendor/aosp/google_devices/oriole and the paths are vendor/google_devices/raven vendor/google_devices/oriole BUG: 182332166 Change-Id: I947934c7f2d38c6fe504cfe8a4368d9b426e4b48 --- device-oriole.mk | 1 + device-raven.mk | 1 + oriole/BoardConfig.mk | 1 + raven/BoardConfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index a0e71f2..ad844f4 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -19,6 +19,7 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay diff --git a/device-raven.mk b/device-raven.mk index 5f1bf36..444ff26 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -19,6 +19,7 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/raven/proprietary/device-vendor.mk) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 84814e3..d94b836 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -20,3 +20,4 @@ USES_DEVICE_GOOGLE_RAVIOLE := true include device/google/gs101/BoardConfig-common.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index cdd3e89..6d752a4 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -20,3 +20,4 @@ USES_DEVICE_GOOGLE_RAVIOLE := true include device/google/gs101/BoardConfig-common.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk From 7c202b299edd6c119329fb869bb08c54470e82de Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Fri, 12 Mar 2021 16:30:19 +0800 Subject: [PATCH 2/2] raviole: support touch sensitivity mode switching Use a persist system property to control the touch driver attribute file glove_mode. 0: default sensitivity mode (default) 1: high sensitivity mode Bug: 173330977 Bug: 174189638 Test: manual test Signed-off-by: Tai Kuo Change-Id: Id5e31bd335f8872993ea82ad9a7e7217ed9de5c6 --- conf/init.oriole.rc | 7 +++++++ conf/init.raven.rc | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc index cfe3106..dd24fe4 100644 --- a/conf/init.oriole.rc +++ b/conf/init.oriole.rc @@ -27,3 +27,10 @@ on fs # Fingerprint chown system system /dev/goodix_fp exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app + +# Toggle glove_mode according to touch_sensitivity_mode +on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 + write /sys/class/spi_master/spi11/spi11.0/glove_mode 00 + +on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1 + write /sys/class/spi_master/spi11/spi11.0/glove_mode 01 diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 6336a93..9eb01b9 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -34,3 +34,10 @@ on fs on property:mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd + +# Toggle glove_mode according to touch_sensitivity_mode +on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 + write /sys/devices/virtual/sec/tsp/cmd "glove_mode,0" + +on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1 + write /sys/devices/virtual/sec/tsp/cmd "glove_mode,1"