From 51073dd50867fc50d3fd493405868df9d2fb449f Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Sat, 1 Mar 2025 18:41:53 +0200
Subject: [PATCH] bluetooth: enable A2DP sink

* A2DP source and sink can coexist on Android 15.
  https://android-review.googlesource.com/q/topic:%22bt_a2dp_src_sink_coexist%22
* Fixes https://github.com/raspberry-vanilla/android_local_manifest/issues/188.
---
 aosp_rpi5.mk                                  |  3 ++-
 aosp_rpi5_car.mk                              |  1 +
 aosp_rpi5_tv.mk                               |  1 +
 overlay/BluetoothRpiOverlay/Android.bp        | 10 ++++++++
 .../BluetoothRpiOverlay/AndroidManifest.xml   | 19 +++++++++++++++
 .../BluetoothRpiOverlay/res/values/config.xml | 24 +++++++++++++++++++
 vendor.prop                                   |  2 ++
 7 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 overlay/BluetoothRpiOverlay/Android.bp
 create mode 100644 overlay/BluetoothRpiOverlay/AndroidManifest.xml
 create mode 100644 overlay/BluetoothRpiOverlay/res/values/config.xml

diff --git a/aosp_rpi5.mk b/aosp_rpi5.mk
index e83588c..ddf3370 100644
--- a/aosp_rpi5.mk
+++ b/aosp_rpi5.mk
@@ -15,8 +15,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 # Overlays
 PRODUCT_PACKAGES += \
     AndroidRpiOverlay \
-    SettingsRpiOverlay \
+    BluetoothRpiOverlay \
     SettingsProviderRpiOverlay \
+    SettingsRpiOverlay \
     SystemUIRpiOverlay \
     WifiRpiOverlay
 
diff --git a/aosp_rpi5_car.mk b/aosp_rpi5_car.mk
index 760d9e9..1a852b2 100644
--- a/aosp_rpi5_car.mk
+++ b/aosp_rpi5_car.mk
@@ -84,6 +84,7 @@ include packages/services/Car/car_product/occupant_awareness/OccupantAwareness.m
 # Overlays
 PRODUCT_PACKAGES += \
     AndroidRpiOverlay \
+    BluetoothRpiOverlay \
     CarServiceRpiOverlay \
     SettingsProviderRpiOverlay \
     WifiRpiOverlay
diff --git a/aosp_rpi5_tv.mk b/aosp_rpi5_tv.mk
index d3c4112..a896dbb 100644
--- a/aosp_rpi5_tv.mk
+++ b/aosp_rpi5_tv.mk
@@ -30,6 +30,7 @@ PRODUCT_COPY_FILES += \
 # Overlays
 PRODUCT_PACKAGES += \
     AndroidTvRpiOverlay \
+    BluetoothRpiOverlay \
     SettingsProviderTvRpiOverlay \
     WifiRpiOverlay
 
diff --git a/overlay/BluetoothRpiOverlay/Android.bp b/overlay/BluetoothRpiOverlay/Android.bp
new file mode 100644
index 0000000..ed72783
--- /dev/null
+++ b/overlay/BluetoothRpiOverlay/Android.bp
@@ -0,0 +1,10 @@
+// Copyright (C) 2021-2022 KonstaKANG
+//
+// SPDX-License-Identifier: Apache-2.0
+
+runtime_resource_overlay {
+    name: "BluetoothRpiOverlay",
+    resource_dirs: ["res"],
+    sdk_version: "current",
+    proprietary: true
+}
diff --git a/overlay/BluetoothRpiOverlay/AndroidManifest.xml b/overlay/BluetoothRpiOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..464c461
--- /dev/null
+++ b/overlay/BluetoothRpiOverlay/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2021-2022 KonstaKANG
+**
+** SPDX-License-Identifier: Apache-2.0
+*/
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.bluetooth.resources.rpi"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+        android:targetPackage="com.android.bluetooth"
+        android:isStatic="true"
+        android:priority="0" />
+</manifest>
diff --git a/overlay/BluetoothRpiOverlay/res/values/config.xml b/overlay/BluetoothRpiOverlay/res/values/config.xml
new file mode 100644
index 0000000..498890a
--- /dev/null
+++ b/overlay/BluetoothRpiOverlay/res/values/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2009-2012 Broadcom Corporation
+     Copyright (C) 2021-2022 KonstaKANG
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- If true, device requests audio focus and start avrcp updates on source start or play -->
+    <bool name="a2dp_sink_automatically_request_audio_focus">true</bool>
+
+</resources>
diff --git a/vendor.prop b/vendor.prop
index 036fdce..7c3e257 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -9,8 +9,10 @@ ro.hardware.audio.primary=rpi_hdmi
 
 # Bluetooth
 bluetooth.device.class_of_device?=90,2,12
+bluetooth.profile.a2dp.sink.enabled?=true
 bluetooth.profile.a2dp.source.enabled?=true
 bluetooth.profile.asha.central.enabled?=true
+bluetooth.profile.avrcp.controller.enabled?=true
 bluetooth.profile.avrcp.target.enabled?=true
 bluetooth.profile.bap.broadcast.assist.enabled?=true
 bluetooth.profile.bap.unicast.client.enabled?=true