Snap for 11517216 from 64a306d0e19d71d49829ea5d7de0db78919a3183 to 24D1-release
Change-Id: I3230cbafe90a889d37f0480db8f27027d36b6d1c
diff --git a/device-felix.mk b/device-felix.mk
index ad942d6..1166a1f 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -266,7 +266,7 @@
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk
@@ -390,7 +390,7 @@
# LE Audio Unicast Allowlist
PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5
+ persist.bluetooth.leaudio.allow_list=SM-R510
# Bluetooth EWP test tool
PRODUCT_PACKAGES_DEBUG += \
diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk
index 1aaac33..a1ed5db 100644
--- a/felix/BoardConfig.mk
+++ b/felix/BoardConfig.mk
@@ -23,7 +23,7 @@
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR)
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
