From e84f3603d1a29ce5d0f613db0c7ce9efa69c5abe Mon Sep 17 00:00:00 2001
From: Ananth Raghavan Subramanian <ananthrs@google.com>
Date: Mon, 18 Jul 2022 15:16:53 -0700
Subject: [PATCH 1/2] init: Change pm_freeze_timeout

Reduce /sys/power/pm_freeze_timeout to 1s from default of 20s.
Data shows that the 20s timeout is rarely hit before suspend is aborted
due to a wakeup/interrupt. Reducing the timeout will help with
diagnosing task freezing issues and will reduce time spent attempting
suspend.

Bug: 239743579
Test: Successfuly boot to home, verify change in node
Signed-off-by: Ananth Raghavan Subramanian <ananthrs@google.com>
Change-Id: I839764dd06ebd66110c11953baf13c06e598dd80
---
 conf/init.gs201.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 9951d52e..cbf3d1b5 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -788,6 +788,9 @@ on property:sys.boot_completed=1
     # write serialno to battery path for pairing
     write /sys/class/power_supply/battery/dev_sn ${ro.boot.serialno}
 
+    # Reduce pm_freeze_timeout value
+    write /sys/power/pm_freeze_timeout 1000
+
 # IMS WiFi Calling
     service charonservice /system/vendor/bin/charon
     class main

From 53dc3e39a696e8edecaf96b11f5728deb895c778 Mon Sep 17 00:00:00 2001
From: Stephane Lee <stayfan@google.com>
Date: Thu, 12 May 2022 17:14:06 -0700
Subject: [PATCH 2/2] Add device-specific support for GoogleBattery AIDL V1

Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: I8266f622641ca42672685ce3869f03b433cadbe6
Merged-In: I8266f622641ca42672685ce3869f03b433cadbe6
---
 device_framework_matrix_product.xml |  4 ++--
 manifest-gralloc3.xml               | 15 +++++++--------
 manifest.xml                        | 15 +++++++--------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d9856b84..7744771b 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -165,9 +165,9 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>1.2</version>
+        <version>1</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 68cac541..920307a3 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -131,14 +131,13 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.google_battery</name>
-      <transport>hwbinder</transport>
-      <version>1.2</version>
-      <interface>
-        <name>IGoogleBattery</name>
-        <instance>default</instance>
-      </interface>
+    <hal format="aidl">
+        <name>vendor.google.google_battery</name>
+        <version>1</version>
+        <interface>
+            <name>IGoogleBattery</name>
+            <instance>default</instance>
+        </interface>
     </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
diff --git a/manifest.xml b/manifest.xml
index a89d04cf..af2fa437 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -64,14 +64,13 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.google_battery</name>
-      <transport>hwbinder</transport>
-      <version>1.2</version>
-      <interface>
-        <name>IGoogleBattery</name>
-        <instance>default</instance>
-      </interface>
+    <hal format="aidl">
+        <name>vendor.google.google_battery</name>
+        <version>1</version>
+        <interface>
+            <name>IGoogleBattery</name>
+            <instance>default</instance>
+        </interface>
     </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>