From 57dd93fb86a16b7bc1e4184853e31cdf4da4772f Mon Sep 17 00:00:00 2001
From: Stephane Lee <stayfan@google.com>
Date: Wed, 15 Dec 2021 12:15:23 -0800
Subject: [PATCH 1/2] Add the rest of the AACR fields

Bug: 205900652
Test: Ensure that there are no permissions denied errors for
google_battery

Change-Id: I0860b84994c24930334407e909e14469f4b3cb94
---
 conf/init.gs101.rc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 32c4157a..4b416146 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -241,6 +241,8 @@ on init
     chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_clear
     chown system system /sys/devices/platform/google,battery/power_supply/battery/health_safety_margin
     chown system system /sys/devices/platform/google,battery/power_supply/battery/aacr_state
+    chown system system /sys/devices/platform/google,battery/power_supply/battery/aacr_cycle_max
+    chown system system /sys/devices/platform/google,battery/power_supply/battery/aacr_cycle_grace
     chown system system /sys/devices/platform/google,charger/bd_drainto_soc
     chown system system /sys/devices/platform/google,charger/bd_recharge_soc
     chown system system /sys/devices/platform/google,charger/bd_recharge_voltage

From 600f2b5c5c2519cc6282cc03441174d06c113156 Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Wed, 15 Dec 2021 17:00:50 -0800
Subject: [PATCH 2/2] DO NOT MERGE Remove unintended face config

Bug: 210921116
Test: N/A
Change-Id: Ie10aaca6892b1246b57941d00b283f202b08035d
---
 device_framework_matrix_product.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index ec6e7172..ba34409a 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -56,13 +56,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-      <name>com.google.face.debug</name>
-        <interface>
-            <name>IDebugHost</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
       <name>com.google.edgetpu</name>
         <interface>