From 71f6bc766728cdfa037b16ed3a320d52d15ab94a Mon Sep 17 00:00:00 2001
From: Ted Wang <tedwang@google.com>
Date: Thu, 28 Mar 2024 06:17:06 +0000
Subject: [PATCH 1/3] [Bluetooth] Enable bthal recovery by restart

Bug: 325998201
Test: Fake bt crash and check log
Change-Id: I836dc6a1ecf978201813ff288fa083d46fc8d9c6
---
 bluetooth/bt_vendor_overlay.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 4f92223..b79de6b 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -20,3 +20,5 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true

From aaec2752ab92fd0318ad0f3389d3578362179263 Mon Sep 17 00:00:00 2001
From: Ted Wang <tedwang@google.com>
Date: Thu, 28 Mar 2024 06:20:34 +0000
Subject: [PATCH 2/3] [Bluetooth]: enable BtHalBqrEnable

Workaround Patch for BQRv6 enable

tldr:
the actual fix in Bluetooth stack is still under prebuilt process
(b/329049227), this workaround is to enable BQR for debug controller
issue in CM4KM4TK4 in advance. and will be reverted when the actual fix
submit.

Bug: 329589582
Test: Manual test
Change-Id: I6ca4cb3d02a8ec6023547cfbe10e3642c215dab5
---
 bluetooth/bt_vendor_overlay.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index b79de6b..1f84e6d 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -22,3 +22,5 @@ BtOpusEnabled = true
 AccelBtDisable = false
 
 BtHalRecoveryByRestart = true
+
+BtHalBqrEnable = true

From 7daf2aed9cb1429f9d023305dc3047dd87c7670a Mon Sep 17 00:00:00 2001
From: Ted Wang <tedwang@google.com>
Date: Thu, 28 Mar 2024 06:22:58 +0000
Subject: [PATCH 3/3] [Bluetooth] Set the HW stage device with an old Bluetooth
 chip that is not longer supported by the BT firmware

Bug: 330484474
Test: fake fw crash in Evt 1.0 device and check the log
Change-Id: Iaee46b189b6c2bb87faf4859c97c9997632622cd
---
 bluetooth/bt_vendor_overlay.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 1f84e6d..318eee5 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -24,3 +24,7 @@ AccelBtDisable = false
 BtHalRecoveryByRestart = true
 
 BtHalBqrEnable = true
+
+# <string> The hardware stage with old chip revision is no longer
+# # supported by BT firmware.
+HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1