From bd29a01fcaf0666a5e029524e3b1fffde836ba1a Mon Sep 17 00:00:00 2001
From: Ray Chi <raychi@google.com>
Date: Tue, 7 Jun 2022 18:23:15 +0800
Subject: [PATCH 1/2] conf: remove the command to start usb statemachine

Bug: 233232746
Test: build pass
Change-Id: I5b82e45e656bd8f6794dbfdb94d0a9b54a674851
---
 conf/init.recovery.device.rc | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/conf/init.recovery.device.rc b/conf/init.recovery.device.rc
index e0de29b..c76e45f 100644
--- a/conf/init.recovery.device.rc
+++ b/conf/init.recovery.device.rc
@@ -1,9 +1 @@
 import /init.recovery.${ro.board.platform}.rc
-
-# DELETE ME USB BRINGUP b/188672439.  Delete the following two lines after
-# USB is brought up completely.
-on property:sys.usb.state=fastboot
-    write /sys/devices/platform/11210000.usb/dwc3_exynos_otg_b_sess 1
-
-on property:sys.usb.state=adb
-    write /sys/devices/platform/11210000.usb/dwc3_exynos_otg_b_sess 1

From 4b1b25fad6f5ee3254fcb773d304769e44533b81 Mon Sep 17 00:00:00 2001
From: Stephane Lee <stayfan@google.com>
Date: Thu, 12 May 2022 17:15:17 -0700
Subject: [PATCH 2/2] Remove device-specific support for GoogleBattery HAL

This is covered by parent projects.

Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: Ifdd0f70ccd69f9c239c7c70ac43db5fd3631be42
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index aafe372..d41ea1e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -122,15 +122,6 @@
             <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>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>