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

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

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 3c24f9a0..c007ae20 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -134,9 +134,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.xml b/manifest.xml
index 1cb5345a..a306c704 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -133,14 +133,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_64.xml b/manifest_64.xml
index 2190686b..a8b512be 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -125,14 +125,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>

From 1dc5d623711523dcbbd641226b03cb2f0fc15e59 Mon Sep 17 00:00:00 2001
From: Prasanna Prapancham <prapancham@google.com>
Date: Thu, 7 Jul 2022 20:26:15 +0000
Subject: [PATCH 2/2] Change ownership of charge_stats to system for clearing

Test: Tested with tablet with dock. Userspace is able to read
and clear sysfs node successfully

Bug: 218802317
Signed-off-by: Prasanna Prapancham <prapancham@google.com>
Change-Id: I1e97920ff0e810ce2888102f3971b21aabc55909
---
 conf/init.gs101.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index c13eb3f1..2e4f37f3 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -254,6 +254,9 @@ on init
     # Thermal Charge stats (write 0)
     chown system system /sys/devices/platform/google,charger/thermal_stats
 
+    # Google Charger stats (write 0)
+    chown system system /sys/devices/platform/google,charger/charge_stats
+
     # Permission for wireless charging
     chown system system /sys/class/power_supply/wireless/capacity
     chown system system /sys/class/power_supply/wireless/device/rtx