From 006ea2415e9eb84c6f387aeecf7fb9178d805c49 Mon Sep 17 00:00:00 2001
From: Cheney Ni <cheneyni@google.com>
Date: Fri, 20 May 2022 20:11:14 +0000
Subject: [PATCH 1/3] Bluetooth: Don't enable OOBS before NVM ready

Bug: 202091533
Test: Turn on Bluetooth without OOBS NVM
Change-Id: Id85e896a0c9663311c55a7975b94fa5a8081d6eb
---
 bluetooth/qti_default.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index aba9799..d41e086 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -27,7 +27,7 @@ TARGET_BLUETOOTH_HCI_V1_1 = true
 TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18"
 UART_USE_TERMIOS_AFC = true
 TARGET_USE_QTI_BT_IBS = false
-TARGET_USE_QTI_BT_OBS = true
+TARGET_USE_QTI_BT_OBS = false
 TARGET_USE_QTI_BT_SAR = true
 TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true
 ifeq ($(TARGET_BLUETOOTH_HCI_V1_1),true)

From 26240608352a2091c52e6346f84d3d1653a01497 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 26 May 2022 17:21:21 +0800
Subject: [PATCH 2/3] Remove Nfc hidl settings

Nfc uses aidl now

Bug: 216290344
Test: manual
Change-Id: I5d1b4c47264adba2c8f517285fe603f1b4fa1188
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 4d4f0f8..6688f36 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -122,15 +122,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>

From 4edfad5109b7e9f527ab5047b0f95d928b9ccf4e Mon Sep 17 00:00:00 2001
From: Lucas Wei <lucaswei@google.com>
Date: Thu, 26 May 2022 11:23:06 +0800
Subject: [PATCH 3/3] Lynx: add requirement for vendor_kernel_boot partition

Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: If5b544370992f8d872a128177358fc6dfa3e928d
---
 board-info.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/board-info.txt b/board-info.txt
index 2fd6143..d737bec 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1 +1,2 @@
 require board=lynx
+require partition-exists=vendor_kernel_boot