From 9dd9934e75ff91f7623bcc93d48c36d5cb96e18b Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Wed, 9 Mar 2022 12:12:36 +0800 Subject: [PATCH 1/3] gps: Set SuplUseFwCellInfo to false - Set SuplUseFwCellInfo=false to prevent SUPL long TTFF issue Bug: 223488012 Test: GNSS sanity test Change-Id: I88491c6bdec598c11ee884ed39ff8d8ec2ce4394 --- gnss/47765/config/gps.xml | 1 + gnss/47765/config/gps.xml.oriole | 1 + gnss/47765/config/gps.xml.raven | 1 + gnss/47765/config/gps_user.xml | 1 + gnss/47765/config/gps_user.xml.oriole | 1 + gnss/47765/config/gps_user.xml.raven | 1 + 6 files changed, 6 insertions(+) diff --git a/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml index 2c5657cf..9c49907e 100644 --- a/gnss/47765/config/gps.xml +++ b/gnss/47765/config/gps.xml @@ -21,6 +21,7 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" SuplUseApn="true" + SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplUT1Seconds="20" diff --git a/gnss/47765/config/gps.xml.oriole b/gnss/47765/config/gps.xml.oriole index d787aba5..f34f73c4 100644 --- a/gnss/47765/config/gps.xml.oriole +++ b/gnss/47765/config/gps.xml.oriole @@ -21,6 +21,7 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" SuplUseApn="true" + SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplUT1Seconds="20" diff --git a/gnss/47765/config/gps.xml.raven b/gnss/47765/config/gps.xml.raven index 38dac2d1..f06958b6 100644 --- a/gnss/47765/config/gps.xml.raven +++ b/gnss/47765/config/gps.xml.raven @@ -21,6 +21,7 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" SuplUseApn="true" + SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplUT1Seconds="20" diff --git a/gnss/47765/config/gps_user.xml b/gnss/47765/config/gps_user.xml index d884819c..9e1a2463 100644 --- a/gnss/47765/config/gps_user.xml +++ b/gnss/47765/config/gps_user.xml @@ -20,6 +20,7 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" SuplUseApn="true" + SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplUT1Seconds="20" diff --git a/gnss/47765/config/gps_user.xml.oriole b/gnss/47765/config/gps_user.xml.oriole index 759e6d2c..3ec656c2 100644 --- a/gnss/47765/config/gps_user.xml.oriole +++ b/gnss/47765/config/gps_user.xml.oriole @@ -20,6 +20,7 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" SuplUseApn="true" + SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplUT1Seconds="20" diff --git a/gnss/47765/config/gps_user.xml.raven b/gnss/47765/config/gps_user.xml.raven index 08133604..98cf347d 100644 --- a/gnss/47765/config/gps_user.xml.raven +++ b/gnss/47765/config/gps_user.xml.raven @@ -20,6 +20,7 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" SuplUseApn="true" + SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplUT1Seconds="20" From 278c90473ba97d882f75a759bce6860f85addf03 Mon Sep 17 00:00:00 2001 From: Alessio Balsini Date: Fri, 3 Dec 2021 00:57:05 +0000 Subject: [PATCH 2/3] FUSE-BPF: enable by default Enable the ro.fuse.bpf.enabled flag in the system configuration to enable the FUSE BPF feature. This feature has already been tested on Cuttlefish devices and no issues have been detected yet. Bug: 202785178 Test: adb shell getprop ro.fuse.bpf.enabled Signed-off-by: Alessio Balsini Change-Id: I7344b8ac2e19fe07d4e27e4e0d28930450caf77e --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 3548bc91..68e80ca9 100644 --- a/device.mk +++ b/device.mk @@ -835,9 +835,9 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true PRODUCT_PRODUCT_PROPERTIES += \ persist.sys.fuse.passthrough.enable=true -# Force disable of FUSE BPF +# Use FUSE BPF PRODUCT_PRODUCT_PROPERTIES += \ - persist.sys.fuse.bpf.enable=false + ro.fuse.bpf.enabled=true # Use /product/etc/fstab.postinstall to mount system_other PRODUCT_PRODUCT_PROPERTIES += \ From 40429a7aef887074fc3f42e8997755e5b4556d6e Mon Sep 17 00:00:00 2001 From: Super Liu Date: Wed, 23 Mar 2022 15:15:38 +0800 Subject: [PATCH 3/3] dumpstate: update the nvt touch path. Bug: 219602920 Test: TH build pass. Signed-off-by: Super Liu Change-Id: I9f97cef742e16ee357bc5b872180682520602c76 --- conf/init.gs101.rc | 4 ++-- dumpstate/DumpstateDevice.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 67495403..83ed0eb4 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -660,8 +660,8 @@ on property:vendor.device.modules.ready=1 chown system system /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd_result chown system system /sys/devices/virtual/sec/tsp/status - chown system system /sys/devices/virtual/input/nvt_touch/force_touch_active - chown system system /sys/devices/virtual/input/nvt_touch/nvt_dttw_mode + chown system system /sys/class/spi_master/spi11/spi11.0/input/nvt_touch/force_touch_active + chown system system /sys/class/spi_master/spi11/spi11.0/input/nvt_touch/nvt_dttw_mode # Allow access to touch chown system input /dev/touch_offload chmod 660 /dev/touch_offload diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 64a6aacc..a5d50352 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -517,7 +517,7 @@ void DumpstateDevice::dumpThermalSection(int fd) { // Dump items related to touch void DumpstateDevice::dumpPreTouchSection(int fd) { - const char nvt_spi_path[] = "/sys/devices/virtual/input/nvt_touch"; + const char nvt_spi_path[] = "/sys/class/spi_master/spi11/spi11.0/input/nvt_touch"; char cmd[256]; /* NVT touch */