From 5c3b95a98f17371e3f3730e3d4c87a6a7a568ca7 Mon Sep 17 00:00:00 2001
From: YiKai Peng <kenpeng@google.com>
Date: Thu, 8 Aug 2024 02:07:50 +0000
Subject: [PATCH 1/2] WLC: service: update AIDL manifest version to 1-2

Test: Build/Flash
Bug: 357493518
Flag: vendor.google.wireless_charger.service.flags.enable_service
Change-Id: If318fd6fe855855a40fbb14157612b75149208cf
Signed-off-by: YiKai Peng <kenpeng@google.com>
---
 wireless_charger/compatibility_matrix.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml
index b760b1d..5185344 100644
--- a/wireless_charger/compatibility_matrix.xml
+++ b/wireless_charger/compatibility_matrix.xml
@@ -9,7 +9,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wireless_charger.service</name>
-        <version>1</version>
+        <version>1-2</version>
         <interface>
             <name>IWlcService</name>
             <instance>default</instance>

From 8aaaec079397371bdac62c129569b4ae11e193ed Mon Sep 17 00:00:00 2001
From: Super Liu <supercjliu@google.com>
Date: Fri, 9 Aug 2024 01:47:32 +0000
Subject: [PATCH 2/2] Refine the GTI dump order

Adjust the order to get the touch snapshot as soon as possible.
This will avoid the following operations to overwrite the touch
statistics for further analysis.

Bug: 356993163
Flag: EXEMPT bugfix
Test: Manual test.
Change-Id: I012544849868ca7b81c11ffa13858eaa209af5c5
Signed-off-by: Super Liu <supercjliu@google.com>
---
 touch/gti/dump_gti0.sh | 10 +++++-----
 touch/gti/dump_gti1.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/touch/gti/dump_gti0.sh b/touch/gti/dump_gti0.sh
index a3af3d7..facb531 100644
--- a/touch/gti/dump_gti0.sh
+++ b/touch/gti/dump_gti0.sh
@@ -8,6 +8,11 @@ else
 heatmap_path=$path
 fi
 
+if [[ -f "${procfs_path}/dump" ]]; then
+  echo "------ Dump ------"
+  cat ${procfs_path}/dump
+fi
+
 echo "------ Force Touch Active ------"
 result=$( cat "$path/force_active" 2>&1 )
 if [ $? -eq 0 ]; then
@@ -60,10 +65,5 @@ cat $heatmap_path/ss_raw
 echo "------ Self Test ------"
 cat $path/self_test
 
-if [[ -f "${procfs_path}/dump" ]]; then
-  echo "------ Dump ------"
-  cat ${procfs_path}/dump
-fi
-
 echo "------ Disable Force Touch Active ------"
 echo 0 > $path/force_active
diff --git a/touch/gti/dump_gti1.sh b/touch/gti/dump_gti1.sh
index 297ad44..eabd6d6 100644
--- a/touch/gti/dump_gti1.sh
+++ b/touch/gti/dump_gti1.sh
@@ -8,6 +8,11 @@ else
 heatmap_path=$path
 fi
 
+if [[ -f "${procfs_path}/dump" ]]; then
+  echo "------ Dump ------"
+  cat ${procfs_path}/dump
+fi
+
 echo "------ Force Touch Active ------"
 result=$( cat "$path/force_active" 2>&1 )
 if [ $? -eq 0 ]; then
@@ -60,10 +65,5 @@ cat $heatmap_path/ss_raw
 echo "------ Self Test ------"
 cat $path/self_test
 
-if [[ -f "${procfs_path}/dump" ]]; then
-  echo "------ Dump ------"
-  cat ${procfs_path}/dump
-fi
-
 echo "------ Disable Force Touch Active ------"
 echo 0 > $path/force_active