From 36a6848e8f4fd78649bc80e322b47be03eaa7eff Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Thu, 15 Feb 2024 02:11:34 +0000
Subject: [PATCH 1/4] Update shiba SVN to 20

Bug: 325156176
Change-Id: I94923b559742576c2cb471b2b54a3004a24d6467
---
 device-shiba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-shiba.mk b/device-shiba.mk
index 08ec835..b9b5cbf 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -374,7 +374,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=19
+    ro.vendor.build.svn=20
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \

From e73a3382ce9e6c62d9ad11f762839e1d9e653467 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Thu, 15 Feb 2024 02:13:24 +0000
Subject: [PATCH 2/4] Update husky SVN to 20

Bug: 325156176
Change-Id: Icefa2c49df565c52d217751afcf166897e071a7a
---
 device-husky.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-husky.mk b/device-husky.mk
index eead649..4619ede 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -400,7 +400,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=19
+    ro.vendor.build.svn=20
 
 # WLC userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

From f52d141a375437a0da6d98776203d3f959bfd54d Mon Sep 17 00:00:00 2001
From: silens <silens@google.com>
Date: Tue, 27 Feb 2024 15:14:05 +0800
Subject: [PATCH 3/4] Modify the default broadcast audio configuration to 48_2

Bug: 326548363
Change-Id: I46d9aee3f1d2cd9ec6836462c9d1b7ecce14b1fb
---
 bluetooth/le_audio_codec_capabilities.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml
index d988d1b..49e1f04 100644
--- a/bluetooth/le_audio_codec_capabilities.xml
+++ b/bluetooth/le_audio_codec_capabilities.xml
@@ -52,7 +52,6 @@
     <scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
     <scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
     <!-- broadcast -->
-    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_4"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_2"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_24_2"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_16_2"/>
@@ -76,7 +75,6 @@
     <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
     <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
     <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="BcastStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="BROADCAST_STEREO"/>

From 8a517f4a68d27bf2e13f6a966df9fc7bcbe9a5ce Mon Sep 17 00:00:00 2001
From: Limon Mia <limonmia@google.com>
Date: Tue, 5 Mar 2024 07:43:44 +0000
Subject: [PATCH 4/4] BT: Set system property for Bluetooth Auto On for P23

Set bluetooth.server.automatic_turn_on true for Bluetooth Auto On
feature.
The feature will be enabled with both system property and flag set.

Bug: 328168961
Test: check system property value
Change-Id: I0c6785fc7daa51b728872892c83ad20babe3253b
---
 device-husky.mk | 4 ++++
 device-shiba.mk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/device-husky.mk b/device-husky.mk
index 49a289c..51a451c 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -118,6 +118,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
+
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
diff --git a/device-shiba.mk b/device-shiba.mk
index 96dddf1..784acdb 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -102,6 +102,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
+
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
 	$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \