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

Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: Iaafb463ce077a8cefe7a612ecf73fbcf8495bd79
---
 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 06c1eee9..88180c91 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -186,9 +186,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 97afb6b6..fa84519d 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.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.xml b/manifest.xml
index c1efc47d..b0f893fd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -75,14 +75,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>