From e8c9a801ab15cfb7e723c03fc1610f83da7fcde1 Mon Sep 17 00:00:00 2001 From: Mason Wang Date: Tue, 19 Apr 2022 09:44:57 +0800 Subject: [PATCH 1/5] Revert "dumpstate: Fix P10 touch can't work after bugreport." This reverts commit 101c17fc9593df2dbfa814209b402039e5549fb2. Reason for revert: Please refer to b/228928861#comment21. Change-Id: Ib85f87de4d8f220c30686c745ceb625a8055d649 --- dumpstate/Dumpstate.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 3556da56..2740484b 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -575,6 +575,10 @@ void Dumpstate::dumpTouchSection(int fd) { snprintf(cmd, sizeof(cmd), "%s/selftest/Short", focaltech_cmd_path); DumpFileToFd(fd, "Get Short Test", cmd); + // Get HeatMap(ms,ss) + snprintf(cmd, sizeof(cmd), "%s/selftest/Strength", focaltech_cmd_path); + DumpFileToFd(fd, "Get HeatMap(ms,ss)", cmd); + // Disable: force touch active snprintf(cmd, sizeof(cmd), "echo 20 > %s/force_active", focaltech_cmd_path); RunCommandToFd(fd, "Disable Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); From 1c08d08e8077bb5b91b0189fe345bb30293722a2 Mon Sep 17 00:00:00 2001 From: Patty Date: Wed, 6 Apr 2022 19:11:26 +0800 Subject: [PATCH 2/5] Enable EWP feature Bug: 220121592 Test: Manual Change-Id: Ie21bf80e294825b299ce54e0bfa4b3e95212db93 --- device_framework_matrix_product.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index bce7e68a..271d92fd 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -186,6 +186,14 @@ default + + hardware.google.bluetooth.ewp + 1.0 + + IBluetoothEwp + default + + vendor.google.google_battery 1.2 From e1a5177c8122078e9c388c1630ce969a3dbe9937 Mon Sep 17 00:00:00 2001 From: ykhung Date: Tue, 19 Apr 2022 17:01:05 +0800 Subject: [PATCH 3/5] Add BLUETOOTH_CONNECT permission for SettingsIntelligence Add BLUETOOTH_CONNECT permission for SettingsIntelligence, which is required for the battery widget feature to launch the detailed bluetooth settings page in the Settings Test: build Bug: 227265502 Change-Id: Iac2cb88aed1abfcef9960438f0e4b198b3d9c12c --- default-permissions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index 2641aa47..8a67c9bc 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -47,6 +47,8 @@ + + From 89f11fce8672e113b44372767ab0d4bcad0aa6e4 Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Tue, 19 Apr 2022 13:25:01 +0000 Subject: [PATCH 4/5] Make IBluetoothEwp optional Change Ie21bf80e294825b299ce54e0bfa4b3e95212db93 caused some broken targets like T6Pro. To mitigate the breakages on targets which are using the same framework matrix but weren't separately enabled/worked around with the BT EWP feature, making the hal optional. Bug: 229722326 Change-Id: Iaa01dc7fed832981e73fe445e0ac67e500120f13 --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 271d92fd..22d32202 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -186,7 +186,7 @@ default - + hardware.google.bluetooth.ewp 1.0 From 9238919dcc4d43dd64186503e5ce2877061ec5e4 Mon Sep 17 00:00:00 2001 From: Paul Thomson Date: Fri, 8 Apr 2022 16:51:23 +0100 Subject: [PATCH 5/5] Update dEQP level to 2022 Bug: b/228449928 Change-Id: I2ec7c9cadd858422b9e4e10324bc6a9621b24cc6 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 975db198..f9558751 100644 --- a/device.mk +++ b/device.mk @@ -204,8 +204,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ - frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ - frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml + frameworks/native/data/etc/android.software.vulkan.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ + frameworks/native/data/etc/android.software.opengles.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml ifeq ($(USE_SWIFTSHADER),true) PRODUCT_VENDOR_PROPERTIES += \