From 33fd6a77c4f5d83d1a8f3e3b4372ec26c6bbb1fe Mon Sep 17 00:00:00 2001
From: Bob Wang <ziyiw@google.com>
Date: Tue, 17 Sep 2024 19:08:14 +0000
Subject: [PATCH 1/2] Add UWB overlay to comet device

This overlay enables multicast list update notification v2 and response v2.

Bug: 353157531
Change-Id: I4959a991316e2c832ddad09fdc541cc5d4b5d8e3
Test: NA
Flag: EXEMPT overlay update
---
 device-comet.mk                               | 4 ++++
 rro_overlays/UwbOverlay/res/values/config.xml | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/device-comet.mk b/device-comet.mk
index 42299bd..2ae42ee 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -343,6 +343,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     device/google/comet/powerstats/comet
 
+# UWB Overlay
+PRODUCT_PACKAGES += \
+	UwbOverlayCT3
+
 # WiFi Overlay
 PRODUCT_PACKAGES += \
 	WifiOverlay2024Mid_CT3 \
diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml
index bf8d264..a1d0fda 100644
--- a/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/rro_overlays/UwbOverlay/res/values/config.xml
@@ -30,4 +30,12 @@
        * When previously foreground 3p apps moves to background, sessions are not terminated
     -->
     <bool name = "background_ranging_enabled">true</bool>
+
+    <!-- Whether multicast list update notification v2 is supported or not.
+     If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
+
+    <!-- Whether multicast list update response v2 is supported or not.
+     If enabled, the response will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_rsp_v2_supported">true</bool>
 </resources>

From 1504de593f4013d22d7998956c1df372e69451d0 Mon Sep 17 00:00:00 2001
From: weichinweng <weichinweng@google.com>
Date: Wed, 18 Sep 2024 07:05:52 +0000
Subject: [PATCH 2/2] BT Offload: Using origin flag to control BT Offload
 feature

Bug: 362627875
Test: Build pass.
Change-Id: I1acfcb1a70399e98dac3dbe11223e883728b1d98
---
 bluetooth/bt_vendor_overlay.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 9343381..e593d7e 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -14,7 +14,7 @@ UserialTypePriority = 2-1
 BtOffloadCap = AOC
 
 # <string> The BT Offload Trunk Flag Group Name
-BtOffloadTrunkGroup = 24F_AOC
+BtOffloadTrunkGroup = 24P_AOC
 
 # <boolean> Enable check whether let aoc controls power pin
 AocPowerPinCtrlCheckEnable = true